PERFORCE change 27335 for review
Robert Watson
rwatson at freebsd.org
Tue Mar 25 04:14:58 GMT 2003
http://perforce.freebsd.org/chv.cgi?CH=27335
Change 27335 by rwatson at rwatson_tislabs on 2003/03/24 20:14:00
Integrate the TrustedBSD MAC branch from the TrustedBSD base
branch: loop back the entry point additions from the main
tree. The main FreeBSD tree policy modules and the local
branch policy modules are now in sync from the perspective
of the entry points they implement. There are still
differences, including a number of policy and parsing fixes
in Biba, the more extensive test handling for thread_userret
in mac_test, and a number of fixes in mac_lomac that need
to be merged relating to label updated for processes.
Affected files ...
.. //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#2 integrate
.. //depot/projects/trustedbsd/mac/etc/mail/aliases#6 integrate
.. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#7 integrate
.. //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#18 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount_nfs/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount_nfs/mount_nfs.8#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/mount_nfs/mount_nfs.c#7 integrate
.. //depot/projects/trustedbsd/mac/sbin/ping/ping.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/alpha/mem.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/include/_types.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/arm/include/_types.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/files.i386#26 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#22 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpivar.h#14 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/bktr/bktr_os.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_vm.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_cbus.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/fb/fb.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/fb/fbreg.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/fb/vga.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/gfb/gfb_pci.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/md/md.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/dsp.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/syscons/syscons.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_pci.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vncache.c#15 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/bde/g_bde.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom.h#20 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_aes.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_apple.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_bsd.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#22 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_disk.c#21 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_gpt.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_mbr.c#14 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_mirror.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_pc98.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_sunlabel.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/geom/geom_vol_ffs.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_wakeup.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/bios/smapi.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/bios/smapi_isa.c#2 delete
.. //depot/projects/trustedbsd/mac/sys/i386/bios/smapi_var.h#2 delete
.. //depot/projects/trustedbsd/mac/sys/i386/bios/smbios.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/i386/bios/vpd.c#1 branch
.. //depot/projects/trustedbsd/mac/sys/i386/i386/busdma_machdep.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/elan-mmcr.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#28 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/mem.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#18 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#30 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/vm86.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#20 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/_types.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/md_var.h#13 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/param.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/pmap.h#10 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/include/smapi.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/isa_dma.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/pcvt/pcvt_drv.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/spigot.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/spkr.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/ia64/mem.c#6 integrate
.. //depot/projects/trustedbsd/mac/sys/ia64/include/_types.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/isa/vga_isa.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#58 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#31 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#30 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/subr_devstat.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#30 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/subr_xxx.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#37 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/uipc_cow.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/uipc_jumbo.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#29 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#25 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/smapi/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/sys/netncp/ncp_subr.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#28 integrate
.. //depot/projects/trustedbsd/mac/sys/pc98/pc98/pc98gdc.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/pc98/pc98/spkr.c#9 delete
.. //depot/projects/trustedbsd/mac/sys/pc98/pc98/syscons.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/agp.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/meteor.c#4 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/xrpu.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/powerpc/include/_types.h#4 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#199 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#70 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#158 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#117 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#94 integrate
.. //depot/projects/trustedbsd/mac/sys/sparc64/include/_types.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/conf.h#15 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/eventhandler.h#9 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/jumbo.h#3 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/malloc.h#12 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/param.h#21 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/systm.h#18 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/types.h#18 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/device_pager.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/pmap.h#15 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_extern.h#9 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#19 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#25 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#29 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_page.h#18 integrate
.. //depot/projects/trustedbsd/mac/sys/vm/vm_pageq.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/x86_64/include/_types.h#2 integrate
.. //depot/projects/trustedbsd/mac/usr.bin/tftp/main.c#7 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/cdcontrol/cdcontrol.c#9 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/kgmon/kgmon.8#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/info.h#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/main.c#6 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/perform.c#5 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/pkg_info.1#4 integrate
.. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/show.c#7 integrate
Differences ...
==== //depot/projects/trustedbsd/mac/bin/chflags/chflags.1#2 (text+ko) ====
@@ -33,9 +33,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)chflags.1 8.4 (Berkeley) 5/2/95
-.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.15 2003/02/18 19:51:59 obrien Exp $
+.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.16 2003/03/24 20:15:58 johan Exp $
.\"
-.Dd May 2, 1995
+.Dd Mar 24, 2003
.Dt CHFLAGS 1
.Os
.Sh NAME
@@ -110,11 +110,16 @@
.Pp
Putting the letters
.Dq Ar no
-before an option causes the flag to be turned off.
+before or removing the letters
+.Dq Ar no
+from a keyword causes the flag to be cleared.
For example:
-.Bl -tag -offset indent -width "nouchg"
+.Pp
+.Bl -tag -offset indent -width "nouchg" -compact
.It Ar nouchg
-the immutable bit should be cleared
+clear the user immutable flag (owner or super-user only)
+.It Ar dump
+clear the nodump flag (owner or super-user only)
.El
.Pp
Symbolic links do not have flags, so unless the
==== //depot/projects/trustedbsd/mac/etc/mail/aliases#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mail/aliases,v 1.16 2003/02/08 19:00:12 gshapiro Exp $
+# $FreeBSD: src/etc/mail/aliases,v 1.17 2003/03/25 00:54:05 gshapiro Exp $
# @(#)aliases 5.3 (Berkeley) 5/24/90
#
# Aliases in this file will NOT be expanded in the header from
@@ -66,7 +66,7 @@
# www: webmaster
# NOTE: /var/msgs and /var/msgs/bounds must be owned by sendmail's
-# DefaultUser (defaults to mailnull) for the msgs alias to work.
+# DefaultUser (defaults to mailnull) for the msgs alias to work.
#
# msgs: "| /usr/bin/msgs -s"
==== //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#7 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.21 2003/03/19 18:21:42 eivind Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes2-o,v 1.24 2003/03/24 18:59:00 eivind Exp $
%
PLAYGIRL, Inc.
Philadelphia, Pa. 19369
@@ -2220,21 +2220,6 @@
%
10 Reasons Why a Beer is Better Than a Man:
- 1. A beer will never invite friends home for dinner without calling.
- 2. A beer won't think less of you if you can't name the Steelers'
- quarterback.
- 3. A beer won't even act amazed if you can.
- 4. You don't have to let a beer win.
- 5. Just because you have dinner with a beer doesn't mean you have to
- sleep with it, too.
- 6. A beer helps with the housework.
- 7. A beer will never fumble with your bra.
- 8. A beer will never take the newspaper apart before you've read it.
- 9. A beer doesn't want you to raise its children.
-10. A beer wouldn't mind if you wanted it to wear a condom.
-%
-10 Reasons Why a Beer is Better Than a Man:
-
1. Having a beer can't make you pregnant.
2. A beer doesn't wouldn't trade you in on a sports car.
3. If a beer did have a sports car, it wouldn't love it more than you.
@@ -2408,12 +2393,6 @@
And, unless I am wrong,
You expected this line to be lewd.
%
-A bather whose clothing was strewed
-By breezes that left her quite nude,
- Saw a man come along
- And, unless I'm quite wrong,
-You expected this line to be lewd.
-%
A beachcomber of 25 had been shipwrecked on a desert island since the age of
six. One day, while in search of food, he stumbled across a beautifully
sensuous female lying on the beach nearly naked; she'd been washed ashore from
@@ -2434,12 +2413,6 @@
A beat schizophrenic said, "Me?
I am not I, I'm a tree."
But another, more sane,
- Shouted, "I'm a great dane "
-And covered his pants leg with pee.
-%
-A beat schizophrenic said, "Me?
-I am not I, I'm a tree."
- But another, more sane,
Shouted, "I'm a Great Dane!"
And covered his pants leg with pee.
%
@@ -2534,12 +2507,6 @@
Was diddling a collie-
But I got a nice price for the pups."
%
-A broken-down harlot named Tupps
-Was heard to confess in her cups:
- "The height of my folly
- Was fucking a collie --
-But I got a nice price for the pups."
-%
A burlesque dancer, a pip
Named Virginia, could peel in a zip;
But she read science fiction
@@ -2677,12 +2644,6 @@
The fuckin' thing broke
And beat both his balls to a creame.
%
-A clever young man named Eugene
-Invented a jack-off machine.
- On the twenty-third stroke
- The goddam thing broke
-And beat both his balls to a creame.
-%
A clitoris is a lot like Antarctica;
most men know it's there, but few really care.
%
@@ -2822,12 +2783,6 @@
Wrote his thesis on cunts and on fucking'em.
But a dropout from paree
Taught him Gamahuchee
-- so he added a footnote on sucking 'em.
-%
-A doctoral student from Buckingham
-Wrote his thesis on cunts and on fucking'em.
- But a dropout from paree
- Taught him Gamahuchee
So he added a footnote on sucking 'em.
%
A do-it-yourselfer named Alice,
@@ -2849,13 +2804,6 @@
Through exuberance, tightness, and malice.
%
A dreary young bank clerk named Fennis
-Wished to foster an aura of menace;
- To make people afraid
- He wore gloves of grey suede
-And white footgear intended for tennis.
- -- Edward Gorey
-%
-A dreary young bank clerk named Fennis
Wished to foster an aura of menace.
To make people afraid
He wore gloves of grey suede
@@ -2996,12 +2944,6 @@
And other odd mammals,
And gives them a go at mama.
%
-A habit obscene and unsavory,
-Holds a CS professor in slavery.
- With maniacal howls,
- He deflowers young owls,
-That he keeps in an underground aviary.
-%
A hacker who screwed a mag tape
Was caught and convicted of rape.
To jail he did go,
@@ -3491,20 +3433,6 @@
attempting to explain the lack of female interest in
pornography.
%
-A nubile female virtually never experiences difficulty in finding willing
-sexual partners, and in a natural habitat nubile females are probably always
-married. The basic female "strategy" is to obtain the best possible husband,
-to be fertilized by the fittest available male (always, of course, taking
-risk into account), and to maximize the returns on sexual favors bestowed:
-to be sexually aroused by the sight of males would promote random matings,
-thus undermining all of these aims, and would also waste time and energy
-that could be spent in economically significant activities and in nurturing
-children. A female's reproductive success would be seriously compromised
-by the propensity to be sexually aroused by the sight of males.
- -- Donald Symons, "The Evolution of Human Sexuality",
- attempting to explain the lack of female interest in
- pornography.
-%
A nuclear family is out golfing one day, when it becomes clear that Dad isn't
going to win any trophies, at least on this course. On the 3rd hole, after
two miserable bogies, he misses a two foot put and exclaims, "Shit!"
@@ -5096,8 +5024,6 @@
COCAINE:
The thinking man's Dristan.
%
-Cocaine -- the thinking man's Dristan.
-%
Cocaine is nature's way of telling you you have too much money.
%
Cocaine isn't habit forming. I should know -- I've been using it for years.
@@ -5779,11 +5705,6 @@
and at least a pint of ether.
-- Hunter S. Thompson, "Fear and Loathing in Las Vegas"
%
-Every now and then when your life gets complicated and the weasels start
-closing in, the only real cure is to load up on heinous chemicals and then
-drive like a bastard from Hollywood to Las Vegas.
- -- Hunter S. Thompson
-%
Every time you masturbate, God kills a kitten.
Please, think of the kittens.
@@ -5987,10 +5908,6 @@
For her were all duds,
Now she's out with the leg of a table.
%
-For a gay time, call 632-9483. Ask for Brucie.
-%
-For a good time, call 632-9484. Ask for Cathy.
-%
For a good time, call 632-9485. Ask for Michael.
%
For a house-to-house salesman named Moore,
@@ -6162,17 +6079,6 @@
daughter and get her number.
(d) Turn red and slink off into the men's room.
%
-FORTUNE TESTS THE GREAT MANAGERS: #7
-You have just returned from a trip to Green Bay, Wisconsin in January
-and tell your boss that nobody but whores and football players live
-there. He mentions that his wife is from Green Bay. You:
-
- (a) Pretend you are suffering from amnesia and don't remember your
- name.
- (b) Ask what position she played.
- (c) Pull a pair of lacey underwear from your pocket and ask if
- he recognizes the label.
-%
FORTUNE TESTS THE GREAT MANAGERS: #9
You are making a sales presentation to a group of corporate executives
@@ -6949,10 +6855,6 @@
next morning found she was six months pregnant?
%
Hear about...
- the farmer who couldn't keep his
- hands off his wife so he fired them?
-%
-Hear about...
the farmer who couldn't keep his hands off his wife, so he
fired them?
%
@@ -7017,10 +6919,6 @@
his ball bearings.
%
Hear about...
- the guy who couldn't find his way to the orgy -- you might say he
- lost his ball bearings?
-%
-Hear about...
the guy who had his vasectomy done by Sears?
Every time he gets a hard-on, the garage door goes up.
%
@@ -7054,10 +6952,6 @@
with young housewives who aren't adequately covered?
%
Hear about...
- the little boy that found a fifty cent
- piece, so he went home for some money?
-%
-Hear about...
the little boy that found a fifty cent piece, so he went home
for some money?
%
@@ -7070,10 +6964,6 @@
York to California and discovered that he still had the same milkman?
%
Hear about...
- the man who took a course in exotic lovemaking and announced that
- he'd never be able to face his girl again?
-%
-Hear about...
the mother of 12 who was called upon to use her diaphragm so often
that she kept it tacked to the headboard of her bed?
%
@@ -7090,10 +6980,6 @@
Los Angeles single bars? It's called Bang Americard.
%
Hear about...
- the new instrument of credit especially designed for use in
- single bars -- BANG AMERICARD?
-%
-Hear about...
the new rule at the girls' school?
Lights out by ten, candles by eleven.
%
@@ -7156,10 +7042,6 @@
feel like a new man?
%
Hear about...
- the woman who says two martinis usually make her feel like a
- new man?
-%
-Hear about...
the young lady attacked in San Francisco?
By two men, one held her down while the other one did her hair.
%
@@ -7677,9 +7559,6 @@
I never trust a man unless I've got his pecker in my pocket.
-- Lyndon Baines Johnson
%
-I never trust a man unless I've got his pecker in my pocket.
- -- Lyndon Johnson
-%
I once had the wife of a Dean
Seven times while the Dean was out skiin'.
She remarked with some gaiety,
@@ -7731,13 +7610,7 @@
I think any man in business would be foolish to fool around
with his secretary. If it's somebody else's secretary, fine.
-- Barry Goldwater
-
-I think every good Christian ought to kick Falwell right in the ass.
- -- Barry Goldwater
%
-I think every good Christian ought to kick Falwell right in the ass.
- -- Barry Goldwater
-%
I think every good Christian ought to kick Falwell's ass.
-- Senator Barry Goldwater, commenting on Jerry Falwell's
suggestion that all good Christians should be against
@@ -7825,13 +7698,6 @@
Is getting to be quite a bore!
-- Gelett Burgess
%
-I wish that my room had a floor;
-I don't so much care for a door,
- But this walking around
- Without touching the ground
-Is getting to be quite a bore!
- -- Gelett Burgess
-%
I wonder what my wife will want tonight;
Wonder if the wife will fuss and fight?
I wonder can she tell
@@ -8824,9 +8690,6 @@
Just go with the flow control, roll with the crunches, and, when you get
a prompt, type like hell.
%
-Just go with the flow control, roll with the
-crunches, and, when you get a prompt, type like hell.
-%
Just once I would like to persuade the audience not to wear any article of
blue denim. If only they could see themselves in a pair of brown corduroys
like mine instead of this awful, boring blue denim. I don't enjoy the sky
@@ -9150,8 +9013,6 @@
-- Samuel Goldwyn
%
Love comes in spurts.
-%
-Love comes in spurts.
--Devo, "Please Please"
%
Love is blind but desire doesn't give a good goddam.
@@ -9256,6 +9117,9 @@
-- Professor Irwin Corey
%
Mary had a little lamb,
+boy was the doctor surprised!
+%
+Mary had a little lamb,
It's fleece as white as snow.
It followed her to school one day,
And got fucked by a big black dog.
@@ -9627,20 +9491,13 @@
They nearly knocked me down to be the first in town
To get their Elephant Shit On Rye!
%
-`My trip? It was vile. Balaclava
+"My trip? It was vile. Balaclava
I loathed. Etna was crawling with lava.
The ship was all white
But it creaked in the night,
And the band, they did not know la java."
-- Edward Gorey
%
-`My trip? It was vile. Balaclava
-I loathed. Etna was crawling with lava.
- The ship was all white
- But it creaked in the night,
-And the band, they did not know la java."
- -- Edward Gorey
-%
My wife and I only smoke after sex. I've had the same pack since 1967.
She's up to three packs a day.
-- Rodney Dangerfield
@@ -9831,8 +9688,6 @@
their commanders not allowing them to write "fuck" on their airplanes
because it's obscene.
%
-Obscenity is a crutch for lazy Motherfuckers.
-%
Obscenity is the crutch of inarticulate motherfuckers.
%
Oden the bardling averred
@@ -9901,12 +9756,6 @@
Tore his testes away -
- An example of animal huma.
%
-Oh pity the prince, Montezuma
-He tried to make love to a puma.
- Seems the puma, in play,
- Tore his testes away --
-An example of animal huma.
-%
Oh what a tangled web we weave when first we practice to conceive.
-- Don Herold
%
@@ -9929,12 +9778,6 @@
Warning: Avoid contact with eyes and open cuts.
Keep away from open naked flames -- both old and new.
%
-Old King Cole was a merry old soul,
-A merry old soul was he.
-He called for his pipe,
-And he called for his drums,
-And he fiddled with his call girls three.
-%
Old King Cole
Was a merry old soul,
A merry old soul was he!
@@ -10039,12 +9882,6 @@
For the sake of the blind,
Was the same information -- in Braille.
%
-On the breasts of a harlot from Yale
-Was tattooed the price of her tail
- And on her behind,
- For the sake of the blind,
-Was the same information in Braille.
-%
On the porch of a dude named Horatio,
His girl got a yen for fellatio.
As she sucked on his dingus
@@ -10326,12 +10163,6 @@
With an actress, a whore and a poetess.
When asked what position
He used for coition,
-He answered serenely, "the loetus."
-%
-One evening a guru had coitus
-With an actress, a whore and a poetess.
- When asked what position
- He used for coition,
He answered serenely, "the lotus."
%
One fall day, two men were out in the woods hunting. Feeling a sudden need
@@ -10496,31 +10327,6 @@
There's no stopping it --
For short trips, two poots take you far.
%
-Our team usually puts the other woman at second base, where the maximum
-possible number of males can get there on short notice to help out in case
-of emergency. As far as I can tell, our second basewoman is a pretty good
-baseball player, better than I am, anyway, but there's no way to know for
-sure because if the ball gets anywhere near her, a male comes barging over
-from, say, right field, to deal with it. She's been on the team for three
-seasons now, but the males still don't trust her. They know, deep in their
-souls, that if she had to choose between catching a fly ball and saving an
-infant's life, she probably would elect to save the infant's life, without
-ever considering whether there were men on base.
- -- Dave Barry, "Sports is a Drag"
-%
-Our team usually puts the other woman at second base, where the maximum
-possible number of males can get there on short notice to help out in
-case of emergency. As far as I can tell, our second basewoman is a
-pretty good baseball player, better than I am, anyway, but there's no
-way to know for sure because if the ball gets anywhere near her, a male
-comes barging over from, say, right field, to deal with it. She's been
-on the team for three seasons now, but the males still don't trust
-her. They know, deep in their souls, that if she had to choose between
-catching a fly ball and saving an infant's life, she probably would
-elect to save the infant's life, without ever considering whether there
-were men on base.
- -- Dave Barry, "Sports is a Drag"
-%
Our universe itself keeps on expanding and expanding,
In all of the directions it can whiz;
As fast as it can go, that's the speed of light, you know,
@@ -11917,7 +11723,6 @@
It's Commode Huggin' Time In The Valley
If You Want to Keep the Beer Real Cold, Put It Next to My Ex-wife's Heart
If You Get the Feeling That I Don't Love You, Feel Again
-I'm Ashamed To Be Here, But Not Ashamed Enough To Leave
It's the Bottle Against the Bible in the Battle For Daddy's Soul
My Wife Ran Off With My Best Friend, And I Sure Miss Him
Don't Cut Any More Wood, Baby, 'Cause I'll Be Comin' Home With A Load
@@ -12703,7 +12508,7 @@
%
The honest female orgasm is three to fifteen rhythmic contractions of the
outer third of the vagina at .8 second intervals, which is approximately
-the beat of Surfing Safari" by the Beach Boys. Unless these contractions
+the beat of "Surfing Safari" by the Beach Boys. Unless these contractions
occur, you can regard her groaning, moaning, clawing, kicking, begging for
mercy, and shouting filthy religious epithets as bargain-basement histrionics.
-- John Hughes, National Lampoon
@@ -15092,10 +14897,6 @@
Why is it that there are so many more horses' asses than there are horses?
-- G. Gordon Liddy
%
-Why is it that there are so many more
-horses' asses than there are horses?
- -- G. Gordon Liddy
-%
Why is Mrs. Carter always on top when she and Jimmy make love?
Because all Jimmy Carter can do is fuck up.
%
==== //depot/projects/trustedbsd/mac/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#18 (text+ko) ====
@@ -1,9 +1,9 @@
<!--
FreeBSD Japanese Documentation Project
- $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.82 2003/03/22 05:47:29 hrs Exp $
+ $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.83 2003/03/24 21:42:53 hrs Exp $
- Original revision: 1.523
+ Original revision: 1.524
-->
<articleinfo>
@@ -11,7 +11,7 @@
<corpauthor>FreeBSD ¥×¥í¥¸¥§¥¯¥È</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.82 2003/03/22 05:47:29 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.83 2003/03/24 21:42:53 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
==== //depot/projects/trustedbsd/mac/sbin/mount_nfs/Makefile#3 (text+ko) ====
@@ -1,6 +1,6 @@
# @(#)Makefile 8.2 (Berkeley) 3/27/94
#
-# $FreeBSD: src/sbin/mount_nfs/Makefile,v 1.12 2001/12/04 02:19:51 obrien Exp $
+# $FreeBSD: src/sbin/mount_nfs/Makefile,v 1.13 2003/03/25 00:16:41 mdodd Exp $
PROG= mount_nfs
SRCS= mount_nfs.c getmntopts.c mounttab.c
@@ -9,7 +9,7 @@
MOUNT= ${.CURDIR}/../mount
UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall
CFLAGS+= -DNFS -I${MOUNT} -I${UMNTALL}
-WARNS= 0
+WARNS= 2
.PATH: ${MOUNT} ${UMNTALL}
==== //depot/projects/trustedbsd/mac/sbin/mount_nfs/mount_nfs.8#6 (text+ko) ====
@@ -31,7 +31,7 @@
.\"
.\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95
.\"
-.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.36 2003/01/27 20:12:32 dillon Exp $
+.\" $FreeBSD: src/sbin/mount_nfs/mount_nfs.8,v 1.37 2003/03/25 01:25:30 mdodd Exp $
.\""
.Dd March 29, 1995
.Dt MOUNT_NFS 8
@@ -227,6 +227,10 @@
for regular files, and 30 -> 60 seconds for directories. The algorithm to
calculate the timeout is based on the age of the file. The older the file,
the longer the cache is considered valid, subject to the limits above.
+.It noinet4
+.It noinet6
+Disables AF_INET or AF_INET6 connections. Useful for hosts that have
+both an A record and an AAAA record for the same name.
.El
.Pp
.Bl -tag -width "dumbtimerXX"
==== //depot/projects/trustedbsd/mac/sbin/mount_nfs/mount_nfs.c#7 (text+ko) ====
@@ -45,7 +45,7 @@
static char sccsid[] = "@(#)mount_nfs.c 8.11 (Berkeley) 5/4/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.57 2002/09/14 15:14:29 mux Exp $";
+ "$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.59 2003/03/25 01:25:30 mdodd Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -72,6 +72,7 @@
#include <netdb.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <strings.h>
#include <sysexits.h>
#include <unistd.h>
@@ -97,6 +98,8 @@
#define ALTF_ACDIRMIN 0x20000
#define ALTF_ACDIRMAX 0x40000
#define ALTF_NOLOCKD 0x80000
+#define ALTF_NOINET4 0x100000
+#define ALTF_NOINET6 0x200000
struct mntopt mopts[] = {
MOPT_STDOPTS,
@@ -120,6 +123,8 @@
{ "acdirmin=", 0, ALTF_ACDIRMIN, 1 },
{ "acdirmax=", 0, ALTF_ACDIRMAX, 1 },
{ "lockd", 1, ALTF_NOLOCKD, 1 },
+ { "inet4", 1, ALTF_NOINET4, 1 },
+ { "inet6", 1, ALTF_NOINET6, 1 },
{ NULL }
};
@@ -171,6 +176,8 @@
};
#define BGRND 1
#define ISBGRND 2
+#define OF_NOINET4 4
+#define OF_NOINET6 8
int retrycnt = -1;
int opflags = 0;
int nfsproto = IPPROTO_UDP;
@@ -248,7 +255,7 @@
int c;
struct nfs_args *nfsargsp;
struct nfs_args nfsargs;
- int mntflags, altflags, nfssvc_flag, num;
+ int mntflags, altflags, num;
char *name, *p, *spec;
char mntpath[MAXPATHLEN];
@@ -332,6 +339,10 @@
*/
if (altflags & ALTF_BG)
opflags |= BGRND;
+ if (altflags & ALTF_NOINET4)
+ opflags |= OF_NOINET4;
+ if (altflags & ALTF_NOINET6)
+ opflags |= OF_NOINET6;
if (altflags & ALTF_MNTUDP)
mnttcp_ok = 0;
if (altflags & ALTF_TCP) {
@@ -528,6 +539,12 @@
*/
remoteerr = 0;
for (ai = ai_nfs; ai != NULL; ai = ai->ai_next) {
+ if ((ai->ai_family == AF_INET6) &&
+ (opflags & OF_NOINET6))
+ continue;
+ if ((ai->ai_family == AF_INET) &&
+ (opflags & OF_NOINET4))
+ continue;
ret = nfs_tryproto(nfsargsp, ai, hostp, spec, &errstr);
if (ret == TRYRET_SUCCESS)
break;
@@ -690,7 +707,8 @@
try.tv_sec = 10;
try.tv_usec = 0;
- stat = clnt_call(clp, NFSPROC_NULL, xdr_void, NULL, xdr_void, NULL,
+ stat = clnt_call(clp, NFSPROC_NULL, (xdrproc_t)xdr_void, NULL,
+ (xdrproc_t)xdr_void, NULL,
try);
if (stat != RPC_SUCCESS) {
if (stat == RPC_PROGVERSMISMATCH && trymntmode == ANY) {
@@ -719,7 +737,8 @@
clp->cl_auth = authsys_create_default();
nfhret.auth = RPCAUTH_UNIX;
nfhret.vers = mntvers;
- stat = clnt_call(clp, RPCMNT_MOUNT, xdr_dir, spec, xdr_fh, &nfhret,
+ stat = clnt_call(clp, RPCMNT_MOUNT, (xdrproc_t)xdr_dir, spec,
+ (xdrproc_t)xdr_fh, &nfhret,
try);
auth_destroy(clp->cl_auth);
if (stat != RPC_SUCCESS) {
==== //depot/projects/trustedbsd/mac/sbin/ping/ping.c#15 (text+ko) ====
@@ -45,7 +45,7 @@
static char sccsid[] = "@(#)ping.c 8.1 (Berkeley) 6/5/93";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/ping/ping.c,v 1.89 2003/03/24 11:26:08 bde Exp $";
+ "$FreeBSD: src/sbin/ping/ping.c,v 1.90 2003/03/24 23:48:36 mdodd Exp $";
#endif /* not lint */
/*
@@ -167,7 +167,6 @@
int uid; /* cached uid for micro-optimization */
u_char icmp_type = ICMP_ECHO;
u_char icmp_type_rsp = ICMP_ECHOREPLY;
-int timeoffset = 0;
int phdr_len = 0;
/* counters */
@@ -439,31 +438,33 @@
usage();
target = argv[optind];
- maxpayload = IP_MAXPACKET - sizeof(struct ip) - MINICMPLEN;
- if (options & F_MASK) {
+ switch (options & (F_MASK|F_TIME)) {
+ case 0: break;
+ case F_MASK:
icmp_type = ICMP_MASKREQ;
icmp_type_rsp = ICMP_MASKREPLY;
- timeoffset = MASK_LEN;
- datalen -= MASK_LEN;
- phdr_len += MASK_LEN;
+ phdr_len = MASK_LEN;
if (!(options & F_QUIET))
(void)printf("ICMP_MASKREQ\n");
- }
- if (options & F_TIME) {
+ break;
+ case F_TIME:
icmp_type = ICMP_TSTAMP;
icmp_type_rsp = ICMP_TSTAMPREPLY;
- timeoffset = TS_LEN;
- datalen -= TS_LEN;
- phdr_len += TS_LEN;
+ phdr_len = TS_LEN;
if (!(options & F_QUIET))
(void)printf("ICMP_TSTAMP\n");
+ break;
+ default:
+ errx(EX_USAGE, "ICMP_TSTAMP and ICMP_MASKREQ are exclusive.");
+ break;
}
+ maxpayload = IP_MAXPACKET - sizeof(struct ip) - MINICMPLEN - phdr_len;
if (options & F_RROUTE)
maxpayload -= MAX_IPOPTLEN;
if (datalen > maxpayload)
errx(EX_USAGE, "packet size too large: %d > %d", datalen,
maxpayload);
- datap = &outpack[MINICMPLEN + phdr_len];
+ datap = &outpack[MINICMPLEN + phdr_len + TIMEVAL_LEN];
if (options & F_PINGFILLED) {
fill((char *)datap, payload);
}
@@ -524,16 +525,13 @@
errx(EX_USAGE,
"-I, -L, -T flags cannot be used with unicast destination");
- if (datalen - TIMEVAL_LEN >= TIMEVAL_LEN) { /* can we time transfer */
- datalen -= TIMEVAL_LEN;
- phdr_len += TIMEVAL_LEN;
+ if (datalen >= TIMEVAL_LEN) /* can we time transfer */
timing = 1;
- }
packlen = MAXIPLEN + MAXICMPLEN + datalen;
packlen = packlen > IP_MAXPACKET ? IP_MAXPACKET : packlen;
if (!(options & F_PINGFILLED))
- for (i = phdr_len; i < datalen; ++i)
+ for (i = TIMEVAL_LEN; i < datalen; ++i)
*datap++ = i;
ident = getpid() & 0xFFFF;
@@ -869,11 +867,12 @@
icp->icmp_otime = htonl((now.tv_sec % (24*60*60))
* 1000 + now.tv_usec / 1000);
if (timing)
- bcopy((void *)&now, (void *)&outpack[MINICMPLEN + timeoffset],
- sizeof(struct timeval));
+ bcopy((void *)&now,
+ (void *)&outpack[MINICMPLEN + phdr_len],
+ sizeof(struct timeval));
}
- cc = MINICMPLEN + datalen + timeoffset;
+ cc = MINICMPLEN + phdr_len + datalen;
/* compute ICMP checksum here */
icp->icmp_cksum = in_cksum((u_short *)icp, cc);
@@ -954,7 +953,7 @@
#else
tp = icp->icmp_data;
#endif
- tp+=timeoffset;
+ tp += phdr_len;
/* Copy to avoid alignment problems: */
memcpy(&tv1, tp, sizeof(tv1));
@@ -1565,7 +1564,7 @@
&pat[13], &pat[14], &pat[15]);
if (ii > 0)
- for (kk = 0; kk <= maxpayload - (phdr_len + ii); kk += ii)
+ for (kk = 0; kk <= maxpayload - (TIMEVAL_LEN + ii); kk += ii)
for (jj = 0; jj < ii; ++jj)
bp[jj + kk] = pat[jj];
if (!(options & F_QUIET)) {
==== //depot/projects/trustedbsd/mac/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.43 2003/03/03 12:15:38 phk Exp $
+ * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.44 2003/03/25 00:06:59 jake Exp $
*/
/*
@@ -218,7 +218,7 @@
* instead of going through read/write *
\*******************************************************/
static int
-memmmap(dev_t dev, vm_offset_t offset, vm_offset_t *paddr, int prot)
+memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
{
/*
* /dev/mem is the only one that makes sense through this
==== //depot/projects/trustedbsd/mac/sys/alpha/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/alpha/include/_types.h,v 1.3 2003/02/08 20:37:54 mike Exp $
+ * $FreeBSD: src/sys/alpha/include/_types.h,v 1.4 2003/03/25 00:07:00 jake Exp $
*/
#ifndef _MACHINE__TYPES_H_
@@ -89,6 +89,7 @@
typedef __uint64_t __u_register_t;
typedef __uint64_t __vm_offset_t;
typedef __int64_t __vm_ooffset_t;
+typedef __uint64_t __vm_paddr_t;
typedef __uint64_t __vm_pindex_t;
typedef __uint64_t __vm_size_t;
==== //depot/projects/trustedbsd/mac/sys/arm/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/arm/include/_types.h,v 1.2 2002/08/23 16:49:04 mike Exp $
+ * $FreeBSD: src/sys/arm/include/_types.h,v 1.3 2003/03/25 00:07:00 jake Exp $
*/
#ifndef _MACHINE__TYPES_H_
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list