CVS update: samba/source/locking

[Jeremy Allison]

Date:	Mon Mar 11 10:26:08 2002
Author:	jra

Update of /data/cvs/samba/source/locking
In directory va:/tmp/cvs-serv12585/locking

Modified Files:
      Tag: SAMBA_2_2
	brlock.c locking.c 
Log Message:
Merge in the locking changes from HEAD. Added "inherit acls" parameter,
no code yet.
Jeremy.


Revisions:
brlock.c		1.15.4.16 => 1.15.4.17
	http://www.samba.org/cgi-bin/cvsweb/samba/source/locking/brlock.c?r1=1.15.4.16&r2=1.15.4.17
locking.c		1.93.2.31 => 1.93.2.32
	http://www.samba.org/cgi-bin/cvsweb/samba/source/locking/locking.c?r1=1.93.2.31&r2=1.93.2.32