Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Breath deep and take __P out of the system include files.

# This appears to not break X11, but I'm having problems compiling the
# glide part of the server with or without this patch, so I can't tell
# for sure.

$Id$ -> $FreeBSD$

Fixed pedantic syntax error (trailing comma in enum).

Removed `#pragma ident' (for a FreeBSD Id) so that the K&R support
isn't gratuitously broken. This also prevents ANSI compilers from
recognizing the pragma as a request to run /usr/games/hack...
FreeBSD Ids should be in comments or rcsids, not in `#pragma ident's
(which are equivalent to comments when compiled by gcc), and the
only FreeBSD change in this file seems to be adding the Id.

Resolve conflicts.

This commit was generated by cvs2svn to compensate for changes in r26206,
which included commits to RCS files with non-trunk default branches.

Hold onto your hats folks, here it comes: the first stage of the
Secure RPC import I've been threatening.

This step adds some necessary protocol definition files and headers to
rpcsvc, including the ones needed for NIS+.

Reviewed by: Mark Murray