merge from 2.2
commit6ab0e949d18b97ea7177175a4e6abb5ba076db98
authorGerald Carter <jerry@samba.org>
Fri, 10 Aug 2001 04:27:26 +0000 (10 04:27 +0000)
committerGerald Carter <jerry@samba.org>
Fri, 10 Aug 2001 04:27:26 +0000 (10 04:27 +0000)
tree664319ebc93f2873ce8c96dafb775faa33ec0c88
parent36e01dcdbd0fc0083ac31ec942bb033a2997a16a
merge from 2.2
source/param/loadparm.c
source/smbd/lanman.c
source/smbd/nttrans.c