Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

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

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

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

Minor update about rc.conf.

Change old-style function definition

Add missing braces

Obtained from: DragonFly

Rework all non-contributed files that use `struct timezone'.

This structure is not part of POSIX. According to POSIX, gettimeofday()
has the following prototype:

int gettimeofday(struct timeval *restrict tp, void *restrict tzp);

Also, POSIX states that gettimeofday() shall return 0 (as long as tzp is
not used). Remove dead error handling code. Also use NULL for a
nul-pointer instead of integer 0.

While there, change all pieces of code that only use tv_sec to use
time(3), as this provides less overhead.

Remove trailing whitespace per mdoc lint warning

Disussed with: gavin
No objection from: doc
Approved by: joel
MFC after: 3 days

fgets(3) returns a pointer, so compare against NULL, not integer 0.

Spelling fixes for usr.sbin/

Fix r228719; when you use intmax_t, you need stdint.h.

Pointy hat to: dim
MFC after: 1 week

Some people pointed out long is 32-bit on some arches, while time_t is
64-bit, so better cast time_t to intmax_t, and use the appropriate
printf format strings.

MFC after: 1 week

In usr.sbin/timed, fix several issues with printf formats:
- Cast time_t's to long, and print them with %ld.
- Print ptrdiff_t's with %td.
- Print ssize_t's and size_t's with %zd and %zu.
- Print int32_t's with %d.
Also, replace some int variables with the more appropriate size_t.

MFC after: 1 week

Simplify inclusion of the tsptype array a bit.

We don't need this array in timed.c -- only readmsg.c.

Check return code of setuid() in timedc.

While it will not fail in normal circumstances, better safe than
sorry.

MFC after: 3 days

Remove the advertising clause from UCB copyrighted files in usr.sbin. This
is in accordance with the information provided at
ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change

Move most of the remaining USD/PSD/SMM papers into share/doc

Initialise the "trials" variable to zero earlier in case we unexpectedly
error out early.

Found by: clang static analyzer

mdoc: replace troff macros with -mdoc equivalents

Port timed away from logwtmp(3). Let it use utmpx.

Fix LLVM compiler errors related to K&R declarations with ANSI prototypes.

Submitted by: Pawel Worach <pawel.worach@gmail.com>

Remove spurious duplicated defination of sock.

getopt returns an int, not a char. Make sure that we store the
variable in an int to avoid casting to an unsigned value which causes
the comparison with -1 to fail.

PR: 123807
Submitted by: Matthew Luckie
Reviewed by: keramida@
MFC after: 1 week

Typo fix.

Spotted by: brueffer

Enhance descriptions in the timed manual.

PR: docs/115445
Submitted by: "Julian Stacey" <jhs at berklix dot org>
MFC After: 3 days

Cleanup of userland __P use

o Remove duplicate includes.

Obtained from: Slava Semushin via NetBSD

Sort sections.

Mechanically kill hard sentence breaks.

Fix typo, s/transmitts/transmits/

PR: 62346
Submitted by: Gavin Atkinson (gavin at ury.york.ac.uk)

Fix a BSS buffer overflow caused by makeargv() writing past the end of
margv[] when an input line contains 20 or more space-separated words.

missing word

reference ntpd(8)

Mark the -i and -n options as mutually exclusive and fix various
mdoc formatting nits.

PR: 57027
Approved by: simon
Obtained from: OpenBSD

de-__P
use port/proto to represent services (not proto/port).
add FBSDID

Change incorrect strings.h to more correct string.h to pick up
declarations for strlcpy, strlen, strmp and strcpy.

Add section number to .Xr

Fix typos, mostly s/ an / a / where appropriate and a few s/an/and/
Add FreeBSD Id tag where missing.

The .Nm utility

Use the length modifier 'l' when supplying an argument of
type long to printf(3).

- Remove unnecessary inclusion of <utmp.h>.
- Cast a value to time_t before comparing it to another
time_t to fix a warning.

timed(8) manual page has some incorrect grammer

PR: 36457
No objections from: ru

o Move NTOHL() and associated macros into <sys/param.h>. These are
deprecated in favor of the POSIX-defined lowercase variants.
o Change all occurrences of NTOHL() and associated marcros in the
source tree to use the lowercase function variants.
o Add missing license bits to sparc64's <machine/endian.h>.
Approved by: jake
o Clean up <machine/endian.h> files.
o Remove unused __uint16_swap_uint32() from i386's <machine/endian.h>.
o Remove prototypes for non-existent bswapXX() functions.
o Include <machine/endian.h> in <arpa/inet.h> to define the
POSIX-required ntohl() family of functions.
o Do similar things to expose the ntohl() family in libstand, <netinet/in.h>,
and <sys/param.h>.
o Prepend underscores to the ntohl() family to help deal with
complexities associated with having MD (asm and inline) versions, and
having to prevent exposure of these functions in other headers that
happen to make use of endian-specific defines.
o Create weak aliases to the canonical function name to help deal with
third-party software forgetting to include an appropriate header.
o Remove some now unneeded pollution from <sys/types.h>.
o Add missing <arpa/inet.h> includes in userland.

Tested on: alpha, i386
Reviewed by: bde, jake, tmm

Unifdef all the SGI code. It mainly added clutter while providing some
specialized logging, SGI-specific priority massaging, and SCI-specific
time trimming support. Also add missing $FreeBSD$'s.

Inspired by: NetBSD

Use fixed-size fields in the structure for the timed protocol. This
includes changing a struct timeval to an explicit structure of two
int32_t's. This requires using temporary timevals in several places
when calling gettimeofday(), settimeofday(), etc. With this timed now
works properly on 64-bit platforms such as Alpha.

Obtained from: NetBSD

Set BINOWN=root explicitly for setuid root binaries.

This is not "useless", as one may have non-default
setting for BINOWN in make.conf, and we still want
these to be installed setuid root in this case.

The timed protocol is not implemented in a compatible way by all vendors;
the size of the tsp_name field is OS-dependent. 4.3BSD used a 32-byte
field, FreeBSD uses MAXHOSTNAMELEN and RedHat apparently uses a 64-byte
field. As a result, sanity checking code added a few months ago to detect
short packets will fail when interoperating with one of these other vendors.

Change the short packet detection code to expect a minimum packet size
corresponding to the 4.3BSD implementation, which should be a safe minimum
size.

Submitted by: Stephen Whiteley <stevew@best.com> (based on)
PR: misc/29867

Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.

Remove whitespace at EOL.

mdoc(7) police: removed HISTORY info from the .Os call.

Patches from OpenBSD:
- check the msg.tsp_type value prior to using it as an
index into char *tsptype[]
- use strlcpy's instead of strcpy's
- & handle short packets properly.

Submitted by: "Andrew R. Reiter" <arr@watson.org>
Obtained from: OpenBSD

mdoc(7) police: properly use a -diag list in the DIAGNOSTICS section.

Reviewed by: ru

- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.

Set the default manual section for usr.sbin/ to 8.

Preceed/preceeding are not english words. Use precede and preceding.

Add $FreeBSD$.

Check that the hostname field in received packets is NUL-terminated.

* Fix a segfault when timed(8) receives a packet with a bad tsp_type.
* Check that received packets aren't too short, as this could cause other
problems.

Reviewed by: imp, markm

Prepare for mdoc(7)NG.

Eliminate groff(1) warnings.

Obtained from: NetBSD

mdoc(7) police: use the new features of the Nm macro.

Avoid use of direct troff requests in mdoc(7) manual pages.

Remove duplicated ';' statement delimiters.

Obtained from: BSD/OS

Add a standard option list and make appropriate changes to the
body of the description.

This is based on a patch from Nick Sanders <fishy@hotbot.com>.

PR: 11978

Change type of vars which hold in_addr.s_addr from u_long to u_int32_t,
for more safety on alpha.

Approved by: jkh

$Id$ -> $FreeBSD$

Add $Id$, to make it simpler for members of the translation teams to
track.

The Id line is normally at the bottom of the main comment block in the
man page, separated from the rest of the manpage by an empty comment,
like so;

.\" $Id$
.\"

If the immediately preceding comment is a @(#) format ID marker than the
the $Id$ will line up underneath it with no intervening blank lines.
Otherwise, an additional blank line is inserted.

Approved by: bde

Remove useless `BINOWN=root' now that it is the default.

Don't assume that time_t is long. Fixed printf format errors.

Don't assume that time_t is long.

Make all strings representing hostnames to be NUL-terminated within
MAXHOSTNAMELEN chars, like everywhere else in the system, so that strcpy()s
and printf()s won't fail.

Back out strcpy() -> strncpy() changes. According to Bruce, they are unneeded.
Check the return value of gethostname() like in timed. Make enough place to
NUL-terminate the result.

Back out strcpy() -> strncpy() changes. According to bruce, they are unneeded.

ntohl->htonl.
OKed by: Bruce

Use err(3).
Sync man page and usage string.
Strcpy -> strncpy from OpenBSD.
-Wall cleaning.
Obtained from: OpenBSD

Convert nets specified with -i/-n to network byte order.
PR: 3906, 3801
Submitted by: Bob Willcox <bob@luke.pmr.com>, Hiroya Tsubakimoto

Typo: .SH --> .Sh.
PR: 3683
Submitted by: Kazuo Horikawa <k-horik@yk.rim.or.jp>

compare return value from getopt against -1 rather than EOF, per the final
posix standard on the topic.

Sort cross references.

Fix some formatting problems. Closed PR# 2377.

Pointed out by: David O'Brien

Fixes:

If timed is running when system clock is changed by date command,
improper wtmp entry is made. According to wtmp(5), two entries, one
with "|" as ut_line field and one with "{" for ut_line, should be
recorded, but, one with "|" and one with "}" are made.

Closes: PR#bin/1182

Submitted by: Masafumi NAKANE <masafumi@tky007.tth.expo96.ad.jp>

Correct some man page cross references and file location references.

Remove trailing whitespace.

Fully initialize (bzero) the stack-allocated "struct sockaddr_in server"
structure. Random junk on the stack would cause the call to bind to fail
in some cases (since the address portion wasn't initialized).

Apply an even number of ntohl's to icmp_otime. This fixes
`timedc clockdiff ...'.

Get rid of update. Make man page installation work with our scheme
(and rename a few in the process).

Why cast a constant to (unsigned long) when you can make it this by
appending UL.

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