diff options
| author | Jeremy Allison <jra@samba.org> | 1998-08-19 01:49:34 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-08-19 01:49:34 +0000 |
| commit | 12de4034c72ea5054d716bf848c2b16bef7a4d89 (patch) | |
| tree | 55a877cb872f4c2584905f02ba2f42d3bbddb9b1 /source3/include | |
| parent | 1e6837837ac402702ccadcbcfd853b8c673c783a (diff) | |
| download | samba-12de4034c72ea5054d716bf848c2b16bef7a4d89.tar.gz samba-12de4034c72ea5054d716bf848c2b16bef7a4d89.tar.bz2 samba-12de4034c72ea5054d716bf848c2b16bef7a4d89.zip | |
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)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 2 | ||||
| -rw-r--r-- | source3/include/proto.h | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 3fd5f7be08..a2419bc42c 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -329,6 +329,8 @@ extern int errno; #include "kanji.h" #include "charset.h" +#include "nterr.h" + #ifndef MAXCODEPAGELINES #define MAXCODEPAGELINES 256 #endif diff --git a/source3/include/proto.h b/source3/include/proto.h index 07e3b70dba..9b7267658d 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); |