Merge of JohnR's changes to appliance-head, JF's changes to 2.2,
authorJeremy Allison <jra@samba.org>
Mon, 12 Feb 2001 16:18:02 +0000 (16:18 +0000)
committerJeremy Allison <jra@samba.org>
Mon, 12 Feb 2001 16:18:02 +0000 (16:18 +0000)
commit94fc44a93c46cece9b9fa947bff62087dbcd89fa
tree292e61a7af5427e683d483a7afd802933ced9b72
parentb4b387e31b241dcf4c8359c8515db689946654d5
Merge ... JohnR's changes to appliance-head, JF's changes to 2.2,
updated the POSIX_ACL code to be in sync.
Jeremy.
(This used to be commit c0517d6f4e3079feca1309fd1ea7b21e83f0de02)
14 files changed:
source3/include/debug.h
source3/include/proto.h
source3/lib/debug.c
source3/lib/messages.c
source3/lib/msrpc_use.c
source3/param/loadparm.c
source3/printing/nt_printing.c
source3/rpc_parse/parse_spoolss.c
source3/smbd/nttrans.c
source3/smbd/posix_acls.c
source3/smbd/process.c
source3/smbd/reply.c
source3/smbd/server.c
source3/utils/smbcontrol.c