- Copy stable/10 (r259064) to releng/10.0 as part of the
10.0-RELEASE cycle.
- Update __FreeBSD_version [1]
- Set branch name to -RC1

[1] 10.0-CURRENT __FreeBSD_version value ended at '55', so
start releng/10.0 at '100' so the branch is started with
a value ending in zero.

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

Respect NO_FSCHG and don't set 'schg' flag on passwd/yppasswd is defined.

MFC after: 2 weeks

None of these programs actually use auth.conf.

MFC after: 1 week

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

Also add $FreeBSD$ to a few files to keep svn happy.

Discussed with: imp, rwatson

Build usr.bin/ with WARNS=6 by default.

Also add some missing $FreeBSD$ to keep svn happy.

Mute some warnings on uninitialized variables.

The code does the right thing, but the compiler is unable to figure it
out. All paths that use that variable use the same invariant.

Revert most part of 200420 as requested, as more review and polish is
needed.

Remove unneeded header includes from usr.bin/ except contributed code.

Tested with: make universe

Markup nits.

Fix a typo

Reimplementation of world/kernel build options. For details, see:

http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)

Cross-reference pw(8) into chpass(1), passwd(1), and vipw(8).

Expand *n't contractions.

Fixed xref.

NO_NIS cleanup: LINKS and MLINKS

Deal with double whitespace.

Mechanically kill hard sentence breaks.

While I really liked the error message one received from `passwd'
when it could not determine the source of the user's passwd(5) entry,
it might be somewhat confusing now that we can have sources that are
not compiled into libc.

mdoc(7) police: Deal with self-xrefs.

Introduce enumerate of options using the standard way.
Remove .Pp between items.

#include <stdlib.h> for exit(3) prototype.

These files haven't been used in a while.

Fix VCS inclusions.

Usage style sweep: spell "usage" with a small 'u'.
Also change one case of blatant __progname abuse (several more remain)
This commit does not touch anything in src/{contrib,crypto,gnu}/.

Use `The .Nm utility'

PAMified passwd(1). Some NIS-related issues remain to be solved, but this
should work for everyday use.

Sponsored by: DARPA, NAI Labs

Remove bogus dependency on rlogin.

remove __P

Fix world breakage introduced by my recent modifications to
chpass(8). The relations between libc, libpam, chpass, passwd, and
vipw are a mess and probably should be cleaned up.

Submitted by: Peter Pentchev <roam@ringlet.net>

Apply the following mechanical transformations in preparation for
ansification and constification:

s{\s+__P\((\(.*?\))\)}{$1}g;
s{\(\s+}{\(}g;
s{\s+\)}{\)}g;
s{\s+,}{,}g;
s{(\s+)(for|if|switch|while)\(}{$1$2 \(}g;
s{return ([^\(].*?);}{return ($1);}g;
s{([\w\)])([!=+/\*-]?=)([\w\(+-])}{$1 $2 $3}g;
s{\s+$}{\n};g

Also add $FreeBSD$ where needed.

MFC after: 1 week

The clnt_create(KEYSERVSOCK, CRYPT_PROG, CRYPT_VERS, "unix") hacks
were removed and replaced them with clnt_tp_create, now the af_local
support is fixed.

I also removed the hack how rpcinfo contacted rpcbind, now we can
relay on clnt_tp_create create the client-handle for us. Only
rpcbind itself needs a hardcoded socket-path.

Submitted by: mbr

Also add $FreeBSD

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.

Remove whitespace at EOL.

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

MAN[1-9] -> MAN.

reset uid back to the user before doing kerberised change password.
root permission is not needed and the kerberos library is paranoid
about access control to the ticket file

PR: bin/20779

Updates for Blowfish password hashing.

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

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

Correct a few typos, including a mis-represented option (-s instead of
-h for NIS host).

Submitted by: Peter Avalos <pavalos@theshell.com>

Fix a premature freeing bug found with malloc debugging courtesy John Hay.

Submitted by: jhay

Add working and easy crypt(3)-switching. Yes, we need a whole new API
for crypt(3) by now. In any case:

Add crypt_set_format(3) + documentation to -lcrypt.
Add login_setcryptfmt(3) + documentation to -lutil.
Support for switching crypt formats in passwd(8).
Support for switching crypt formats in pw(8).

The simple synopsis is:
edit login.conf; add a passwd_format field set to "des" or "md5"; go nuts :)

Reviewed by: peter

Buildworld fixes for NO_OPENSSH and NO_OPENSSL

Approved by: jkh

Remove single-space hard sentence breaks. These degrade the quality
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.

Use libcrypto in place of libdes.

Teach passwd about a new "mixpasswordcase" login.conf parameter. If this
parameter is missing, or specified as above, then passwd behaves as normal
when the user enters an all lower case password -- i.e., it prompts them
to use mixed case, and will only grudgingly accept an all lower case
password.

If you negate this entry in login.conf, with "mixpasswordcase@", then
passwd will allow all lower case passwords without complaining.

Approved by: jkh

Teach passwd about a new "mixpasswordcase" login.conf parameter. If this
parameter is missing, or specified as above, then passwd behaves as normal
when the user enters an all lower case password -- i.e., it prompts them
to use mixed case, and will only grudgingly accept an all lower case
password.

If you negate this entry in login.conf, with "mixpasswordcase@", then
passwd will allow all lower case passwords without complaining.

Approved by: jkh

Revert the libcrypt/libmd stuff back to how it was. This should not have
happened as it was working around problems elsewhere (ie: binutils/ld
not doing the right thing according to the ELF design). libcrypt has
been adjusted to not need the runtime -lmd. It's still not quite right
(ld is supposed to work damnit) but at least it doesn't impact all the
users of libcrypt in Marcel's cross-build model.

Add libmd (or move it after libcrypt). We don't want the linker to be
smart because it will definitely get it wrong. This popped up during
cross-linking.

Update PicoBSD so it does not need to patch the passwd Makefile.

Change edistribution to krb4 in preaparation for K5

Unifdef -DPASSWD_IGNORE_COMMENTS. This wasn't really optional and
we have enough pseudo-options already.

$Id$ -> $FreeBSD$

Allow comments and blank lines as advertised in passwd(5).

PR: 12828
Submitted by: Yasuhiro Fukuma <yasuf@big.or.jp>

Clarify when the user gets a prompt for the old password, and that
passwords are not echoed.

Get quotes right in troff.

Change references from "passwordperiod" to "passwordtime", since
"passwordtime" is what passwd(1) has actually been using. I suspect
passwordperiod was the original intent. I can't figure-out which,
if either, BSDi uses. If anyone knows...

Ignore errors from chflags. This makes it possible to make installworld
with DESTDIR set to an NFS-mounted file system.

Back out the new crypt(3) stuff untill we can go through an independant
"make world" to make sure everything works properly.

Added support for multiple hash formats, and new salt generation code.
It selects which hash format to use by checking /etc/auth.conf for
auth_default. Leaving auth_default disabled will give the current
behaviour (use the same format as is currently used in the password,
or if a new password default to what crypt likes best--des if it exists).
Now you can set it to one of: des, best, md5 or sha1. best is a synonym
for sha1, currently.

We use login.conf, not login.cap

PR: doc/8897
Submitted by: Jonathan Hanna <pangolin@home.com>

Use KJH's auth.conf parser to turn on/off Kerberos in userland.

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

The host commandline option is -h and not -s.

PR: 7703
Submitted by: Yoshishige Arai <ryo2@on.rim.or.jp>

Fix LIBDIR (for aout/ELF).

Use the correct name of the login.conf(5) capability (`passwordperiod' ->
`passwordtime').

Fixed missing dependencies on headers generated by rpcgen, as usual.
Removed bogus dependencies of generated .c files on generated headers.
Sorted sources lists.

Ifdefed conditionally-unused variables.

Prevent passwd locking database forever waiting for user input
Submitted by: Antti Kaipila <anttik@iki.fi>

Fixed `make -jN' for large N, as usual.

Type fix: when -> with

PR: 5420
Submitted by: Jonathan Hanna <jh@pc-21490.bc.rogers.wave.ca>

Changes for KTH KerberosIV.
Also quieten -Wall a bit.

spelling corrections.

PR: docs/4450
Submitted by: josh@quick.net

Cosmetic in usage string and err() messages.

Modify passwd and chpass to use new AF_LOCAL RPC interface instead of
old kludged-up 'yppasswd_comm' support.

kill the undead

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

Remove srandomdev fallback code

login_getclass() -> login_getpwclass()

Fix for PR #3141: check for NULL before strdup()ing pw->pw_class.
(I'm not sure why this happens, though I suspect it may be because
the server is configured with only passwd maps instead of both passwd
and master.passwd maps. This is allowed, but I think in this case
pw_class is left NULL, hence the problem.)

Also applied similar patch to chpass/pw_yp.c just for paranoia's sake.

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

Initialize RNG only once
Use srandomdev() now

Fix srandom arg type according to Lite2

Add ^ getpid() for better srandom results

If an administrator somehow manages to break the hardlinks
on chpass & passwd and turn the links into individual files
with the schg flag set, make install will fail to install all
of the proper links.

Fixed by removing the schg flag on all of the links before installing.

Closes PR# 2040.

Submitted by: Ph. Charnier <charnier@xp11.frmug.org>

Revert $FreeBSD$ to $Id$

Adds login class support for local & nis passwords:
- minpasswordlen=n override minimum password length for class.
- passwordperiod=n[smhdwy] auto-set next password change date.

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

I haven't had a single contraversial commit all week, so what the
heck. Watch through our hidden camera, ladies and gentlemen,
as this one-line addition to the syslog output generates hundreds
of thousands of lines of email in response, all from people
decrying the evils of electronic noise pollution! :-)

What this change does, simply speaking, is syslog it every time
someone changes their local password. I need this at a local ISP to
tell whether people are reacting to expires in a timely fashion or
not. To disable it, uncomment -DLOGGING in the Makefile.

If your users change their passwords so often as to fill your logfile,
then you may also have another administrative problem to deal with.

Fix a core dump condition I discovered the other day (right
after I installed the last SNAP :). Because of the way the 'use NIS
or local?' logic is set up here, it was possible to force the use
of the NIS password changer even though the specified user didn't exist
in NIS (i.e. # passwd foo, where foo is a local-only user). In this
case, we fall intp yp_passwd() without the corresponding yp_password
structure being filled in, which leads to an NULL pointer dereference.

Also fixed the logic like I just did with chpass so that if the user
is both in NIS and the local password database, the program makes a
more sensible guess as to which one to use (if NIS is turned on in
/etc/master.passwd, then use NIS, else default to local).

Reset password change time to zero. (This has no effect with standard
RPC calls to rpc.yppasswdd, but when using the special superuser-only
AF_UNIX socket access method, the server will properly handle all the
additional fields, including pw_change.)

I would also like to take this opportunity to say that Sprint sucks.

Add synopsis for yppasswd.

Implement incremental passwd database updates. This is done by ading a '-u'
option to pwd_mkdb and adding this option to utilities invoking it.
Further, the filling of both the secure and insecure databases has been
merged into one loop giving also a performance improvemnet.
Note that I did *not* change the adduser command. I don't read perl
(it is a write only language anyway).
The change will drastically improve performance for passwd and
friends with large passwd files. Vipw's performance won't change.
In order to do that some kind of diff should be made between the
old and new master.passwd and depending the amount of changes, an
incremental or complete update of the databases should be agreed
upon.

Merge in changes to support the new rpc.yppasswdd(8) and fix a few bugs.

In passwd(1):

- Gut most of yp_passwd.c and leave only a few things that aren't common
to pw_yp.c.

- Add support for -d and -h flags to select domains and NIS server hosts
to use when updating NIS passwords. This allows passwd(1) to be used
for changing NIS passwords from machines that aren't configured as
NIS clients. (This is mostly to allow passwd(1) to work on NIS master
servers that aren't configured as clients -- an NIS server need not
necessarily be configured as a client itself.)

NOTE: Realize that having the ability to specify a domain and hostname
lets you use passwd(1) (and chpass(1) too) to submit update requests
to yppasswd daemons running on remote servers in remote domains which
you may not even be bound to. For example, my machine at home is not
an NIS client of the servers on the network that I manage, yet I can
easily change my password at work using my FreeBSD box at home by doing:
'passwd -d work.net.domain -h any.nis.server.on.my.net wpaul'. (Yes,
I do use securenets at work; temporarily modified my securenets file
to give my home system access.) Some people may not be too thrilled
with this idea. Those who don't like this feature can recompile passwd(1)
and chpass(1) with -DPARANOID to restrict the use of these flags to
the superuser.

(Oh, I should be adding proper securenets support to ypserv(8) and
rpc.yppasswdd(8) over the weekend.)

- Merge in changes to allow root on the NIS master server to bypass
authentication and change any user's NIS password. (The super-user
on the NIS master already has privileges to do this, but doing it
through passwd(1) is much easier than updating the maps by hand.)
Note that passwd(1) communicates with rpc.yppasswdd(8) via a UNIX
domain socket instead of via standard RPC/IP in this case.

- Update man page.

In chpass(1):

- Fix pw_yp.c to work properly in environments where NIS client
services aren't available.

- Use realloc() instead of malloc() in copy_yp_pass() and copy_local_pass().

- Fix silly bug in copy_yp_pass(); some of the members of the passwd
structure weren't being filled in correctly. (This went unnoticed
for a while since the old yppasswdd didn't allow changes to the
fields that were being botched.)

- chpass(1) now also allows the superuser on the NIS master server to
make unrestricted changes to any user's NIS password information.

- Use UNIX domain comm channel to rpc.yppasswdd(8) when run by the
superuser on the NIS master. This allows several new things:

o superuser can update an entire master.passwd.{byname,byuid} entry
o superuser can update records in arbitrary domains using -d flag to
select a domain (before you could only change the default domain)
o superuser can _add_ records to the NIS master.passwd maps, provided
rpc.yppasswdd(8) has been started with the -a flag (to do this,
the superuser must force NIS operation by specifying the -y flag
to chpass(1) along with -a, i.e. 'chpass -y -a 'foo:::::::::')

- Back out the 'chpass -a <new password entry> breaks with NIS' fix
from the last revision and fix it properly this time. The previous
revision fixed the immediate problem but broke NIS operation in
some cases.

- In edit.c, be a little more reasonable about deciding when to
prevent the shell field from being changed.

Submitted by Charles Owens <owensc@enc.edu>, who said:

"I made a minor (one-line) modification to chpass, with regards
to whether or not it allows the changing of shells. In the 2.0.5 code,
field changing follows the settings specified in the "list" structure
defined in table.c . For the shell, though, this is ignored. A quick
look in edit.c showed me why, but I don't understand why it was written as
such. The logic was

if shell is standard shell, allow changing

I changed it to

if shell changing is allowed (per table.c) and it is a standard shell
OR if uid=0, then allow changing."

Makes sense to me.

- Update man page.

Add a little info to this man page at the start so it doesn't
appear that ALL the passwd command does is change a users Kerberos
password, since that is incorrect.

Actually, this man page needs a good overhaul to better reflect systems
that don't have Kerberos installed.

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

recording cvs-1.6 file death

1) Fix local_passwd to co-operate with dual-personality crypt(3).
Changing a local passwd will now keep the encryption type that
was originally used to encrypt the password, so folks adding DES
to their systems will not be irritated/confused by having MD5'ed
passwords in their master.passwd. Coming later is an option to
allow the user to choose the encryption type.

2) Fix a bunch of compiler warnings announced by turning on -Wall.
I did not get them all, that will come a bit later.

Fix a cosmetic null termination problem for completeness.
The #ifdef NEWSALT code doesn't NULL terminate the salt string..
We dont appear to use this code anymore, but it shouldn't hurt

Submitted by: Laurence Lopez <lopez@mv.mv.com>

Small tweak: the 'is exisating password an empty string' check isn't
quite right. (Thic causes you to get prompted for an 'Old Password' when
changing someone's NIS password even if your password isn't set yet.)
Do it like local_passwd.c does.

Point passwd to the new locations of kpasswd.c and kadm.h.

Add pw_yp.c to SRCS. This is code that was moved to chpass, but passwd still
needs it to build.

Bug fix: use the use_yp() function in the chpass(1) code to determine
correctly whether a user is local or NIS (or both, or neither). If you
have a user that exists locally but not in NIS, passwd(1) could get
confused and try to submit the password change to NIS. (Fortunately,
yppasswdd is smart enough to spot the error and reject the change.)

Bug reported by: Charles Owens <owensc@enc.edu>

Remove bogus ${DESTDIR}s from LINKS.

Keep DPADD up to date with LDADD.

bsd.prog.mk's install rule can't handle schg'ed links, so ugly
beforeinstall and afterinstall rules are required.

Remove the ypchfn/ypchsh stuff from passwd and leave just the
yppasswd support. The rest is moving into chpass.

Argh!! Got the arguments in the printf() backwards.

Whoops: getnewpasswd() always says "Changing local password for foo".
Change things slightly so this message says "local" or "YP" as needed
so we can use it for both NIS and local password changes without
confusing people.

getnewyppasswd() in yp_passwd.c doesn't generate correct encrypted
password strings when DES isn't used; somehow the encrypted password
is corrupted and it winds up containing control chars, which yppasswdd
subsequently rejects. This breaks yppasswd on non-DES FreeBSD systems
using NIS.

Fix: scrap getnewyppasswd() entirely and use getnewpasswd() from
local_password.c, since it already works properly and is virtually
identical to getnewyppasswd() anyway. (Wish I'd noticed this sooner.)

This fixes a problem just reported on comp.unix.bsd.freebsd.misc.

Patch to fix PR #518. In a system with no NIS, passwd will complain
that it can't contact an NIS server when asked to change the password
of an invalid user. It should say 'unknown user' instead.

The fix is to check for the _PW_KEYYPENABLED flag in the password
database and only roll over into the yppasswd stuff if the flag
is enabled (this means passwd will not behave as yppasswd if
there are no +::::::::: entries in /etc/master.passwd). If
NIS is enabled but the user says 'passwd -l foouser' where
foouser exists in the NIS maps, but not in /etc/master.passwd,
we also say 'unknown user.' This is so we don't outsmart ourselves:
specifying the -l flag restricts passwd to the local password database
even if NIS is enabled.

This change should probably be merged into 2.1.

Merge RELENG_2_0_5 into HEAD

Remove trailing whitespace.

Remove references to yppasswd_xdr.c: the stuff in this file already exists
in librpcsvc. Add -lrpcsvc to LDADD instead.

Removed redundant function to64() which also exists in local_passwd.c

Remove usage of LINKS and LN_FLAGS=-s, this does not do the correct thing
for symbolic links when $DESTDIR is set.

Add afterinstall: target to handle symbolic link creation.

Changed passwd's Makefile to use the built-in LINKS mechanism to create
the symlinks for yppasswd & friends (we still can't use hard links
because passwd is installed immutable). This would have been simpler
if the LN_FLAGS variable hadn't chosen to wait until now before leaping
out of the /usr/share/mk directory and biting me in the ass. (And thus,
I was enlightened.)

Merge with eBones stuff
Submitted by: mark@grondar.za

cleaned up and modified slightly to reflect changes

Cleaned up Makefile a little, added man page links from ypchsh.1 ypchfn.1
and ypchpass.1 to yppasswd.1. Also fixed a typo: ypshfn != ypchfn.

Changed passwd/yppasswd's Makefile to create all symbolic links instead
of hard links: since passwd is installed immutable, an attempt to make
a hard link to it during a 'make install' would fail. I didn't notice
this conflict because my /usr directory is an NFS filesystem mounted from a
SunOS server, so the special file mode flags had no effecti when I tested
everything on my machine. Live and learn.

Obtained from: The NYS project
This is the first round of changes to incorporate YP server functionality
into FreeBSD. This particular change allows passwd to change either the
local or NIS password, as well as the NIS GECOS and shell information.

Essentially, I've taken passwd(1) and yppasswd from the yppasswd-0.5
distribution (which is part of the NYS project -- a project to provide
a GNU GPL'ed suite of NIS tools) and rammed them into each other
at high speed. I've tried my best to make this co-exist with the
Kerberos stuff, but since I don't run Kerberos I don't have an easy
way to verify that it all works. If you choose any Kerberos flags
then the YP checks should be bypassed, but that may not be enough.
I'll modify it some more if it turns out I broke something. For now,
support for localand NIS passwords is pretty solid:

- If you simply type 'passwd,' the program checks to see if you exist
in the local pwd.db database. If not, you get bounced to YP.

- If you try to force local functionality with the -l flag and you
don't exist locally, you get an error.

The -y flag can be used to force YP functionality. -f and -s let you
change your full name and shell (respectively). -f *and* -s let you
change all of your 'account information.'

ypchfn, ypchsh, yppasswd and ypchpass are all links to passwd.

Update for new kpasswd interface.

Kill old Kerberos password-changing support:

1) It was export-controlled.
2) It used some ad-hoc protocol invented by Berkeley in ignorance of the
standard MIT distribution's way of doing it (which makes it useless
to most people).

This should be fixed once we have `kadmin'/`kadmind'.

Add distribution=krb for P-HK

Always make the salt a 8 char string (incl '\0') for algorithms that can use it

First level of changes for bringing in eBones (kerberos).
- Get rid of inverse logic (NOKERBEROS and NOEBONES) in src/makefile,
and replace with MAKE_KERBEROS and MAKE_EBONES. (Far fewer contortions,
and both default to off.) IF YOU WANT KERBEROS, YOU HAVE TO EXPLICITLY
DEFINE ONE OF THESE.
- Make Makefiles kerberos-aware.

LDADD= -lcrypt
Submitted by: Geoff

Don't use Kerberos yet, we aren't ready for it.

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