merge from 2.2
authorGerald Carter <jerry@samba.org>
Fri, 10 Aug 2001 04:27:26 +0000 (04:27 +0000)
committerGerald Carter <jerry@samba.org>
Fri, 10 Aug 2001 04:27:26 +0000 (04:27 +0000)
commitde5f42c9d9172592779fa2504d44544e3b6b1c0d
treeff2bdb78aa923d47e8c939e022395273be744519
parentfc0fe941d8c2bd012076803452b3b4f21e019ecc
merge from 2.2
(This used to be commit 6ab0e949d18b97ea7177175a4e6abb5ba076db98)
source3/param/loadparm.c
source3/smbd/lanman.c
source3/smbd/nttrans.c