merge from 2.2
authorGerald Carter <jerry@samba.org>
Wed, 26 Sep 2001 14:40:21 +0000 (14:40 +0000)
committerGerald Carter <jerry@samba.org>
Wed, 26 Sep 2001 14:40:21 +0000 (14:40 +0000)
commit247b9c3eba78f0ddd26d836e5e18f6630bf302c7
tree4d8622634bc210a3c18a43ae3b552fcccd8601e2
parentc04f063573c61d8ef3f43815bbb9b6b076dc23eb
merge from 2.2
source/passdb/passdb.c
source/passdb/pdb_nisplus.c