From 12de4034c72ea5054d716bf848c2b16bef7a4d89 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 19 Aug 1998 01:49:34 +0000 Subject: Makefile.in: Moved blocking lock code into smbd/blocking.c for link purposes. include/includes.h: Added nterr.h. locking/locking.c: Moved blocking lock code into smbd/blocking.c for link purposes. smbd/close.c: Added blocking lock removal to file close. smbd/filename.c: Tidied up unix_convert() so I could read it (:-) in preparation for the stat_cache code. smbd/nttrans.c: Added WRITE_ATTRIBUTES check. smbd/reply.c: Fixed multibyte char problem in wildcard mask. Jeremy. (This used to be commit 148eaba3dadb1d0bd3ac3ef53da3d9811636e89a) --- source3/include/proto.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source3/include/proto.h') diff --git a/source3/include/proto.h b/source3/include/proto.h index 07e3b70dbac..9b7267658d3 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -480,8 +480,6 @@ char *smb_errstr(char *inbuf); /*The following definitions come from locking/locking.c */ -BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout, int lock_num); -void process_blocking_lock_queue(time_t t); BOOL is_locked(files_struct *fsp,connection_struct *conn, uint32 count,uint32 offset, int lock_type); BOOL do_lock(files_struct *fsp,connection_struct *conn, @@ -1899,6 +1897,13 @@ uint32 lookup_user_rid(char *user_name, uint32 *rid); BOOL api_wkssvc_rpc(pipes_struct *p, prs_struct *data); +/*The following definitions come from smbd/blocking.c */ + +BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout, int lock_num); +void remove_pending_lock_requests_by_fid(files_struct *fsp); +void remove_pending_lock_requests_by_mid(int mid); +void process_blocking_lock_queue(time_t t); + /*The following definitions come from smbd/chgpasswd.c */ BOOL chat_with_program(char *passwordprogram,char *name,char *chatsequence, BOOL as_root); -- cgit