diff options
| author | Jeremy Allison <jra@samba.org> | 1998-07-23 00:10:26 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-07-23 00:10:26 +0000 |
| commit | 06c0349c445958aebb8a4611bdb7082711585754 (patch) | |
| tree | 68c22e9d853aa0f77717b519abb4832a52331f55 /source3/include | |
| parent | f5866fd4ba8da9acde87c7f9da8f1a242540e287 (diff) | |
| download | samba-06c0349c445958aebb8a4611bdb7082711585754.tar.gz samba-06c0349c445958aebb8a4611bdb7082711585754.tar.bz2 samba-06c0349c445958aebb8a4611bdb7082711585754.zip | |
locking.c: Added lock type to is_locked() and do_lock()
as the code in reply_lockingX wasn't taking account of
the difference between read and write locks ! How did this
ever work :-) !
reply.c:
server.c: Add lock type to is_locked() and do_lock().
util.c: Also added code from klausr@ITAP.Physik.Uni-Stuttgart.De
to fix problem with log files growing too large if an
smbd writes less than 100 debug messages.
Jeremy.
(This used to be commit 80080abf772a470d5f0f4dcd4a75fb2a09a9fb2a)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index b390cb60d9..5819d1aadc 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1149,8 +1149,9 @@ void lp_set_name_resolve_order(char *new_order); /*The following definitions come from locking.c */ -BOOL is_locked(int fnum,int cnum,uint32 count,uint32 offset); -BOOL do_lock(int fnum,int cnum,uint32 count,uint32 offset,int *eclass,uint32 *ecode); +BOOL is_locked(int fnum,int cnum,uint32 count,uint32 offset, int lock_type); +BOOL do_lock(int fnum,int cnum,uint32 count,uint32 offset,int lock_type, + int *eclass,uint32 *ecode); BOOL do_unlock(int fnum,int cnum,uint32 count,uint32 offset,int *eclass,uint32 *ecode); BOOL locking_init(int read_only); BOOL locking_end(void); @@ -1980,6 +1981,7 @@ int sig_usr2(void); int sig_usr1(void); void setup_logging(char *pname,BOOL interactive); void reopen_logs(void); +void force_check_log_size(void); char *tmpdir(void); BOOL is_a_socket(int fd); BOOL next_token(char **ptr,char *buff,char *sep); |