do some merging from 3.0
authorStefan Metzmacher <metze@samba.org>
Tue, 3 Feb 2004 06:37:28 +0000 (06:37 +0000)
committerStefan Metzmacher <metze@samba.org>
Tue, 3 Feb 2004 06:37:28 +0000 (06:37 +0000)
commita8152b68a0d790028a32084e0f0ce664178ffc5c
tree260c5d7974dda77caf6098d7caf725b9ab4bf9ac
parent26ecaa32266e0c8699f280dd190811c310f2939c
do some merging from 3.0

metze
(This used to be commit 47a240d7b833542937a1b93829c1cf8baae2ffc5)
source4/include/nterr.h
source4/include/rpc_secdes.h
source4/include/smb_acls.h
source4/include/smb_macros.h