Date: Tuesday January 16, 2001 @ 9:22 Author: jra Update of /data/cvs/samba/source/smbd In directory samba:/tmp/cvs-serv21608/smbd Modified Files: Tag: SAMBA_2_2 posix_acls.c Log Message: Added merge code to merge ACLs belonging to the same user as POSIX ACLS have no concept of a separate allow and deny ACL for the same user. Jeremy.