diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-08-17 07:15:54 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-08-17 07:15:54 +0000 |
| commit | 4c5c26b1ef4be862fc2037dd5fcc120cb35bacca (patch) | |
| tree | 7cd5959978923119145186e2a3838eb4ea3d3737 /source3/include | |
| parent | 72ed7049d88e5296ebec362189e62a384385ad34 (diff) | |
| download | samba-4c5c26b1ef4be862fc2037dd5fcc120cb35bacca.tar.gz samba-4c5c26b1ef4be862fc2037dd5fcc120cb35bacca.tar.bz2 samba-4c5c26b1ef4be862fc2037dd5fcc120cb35bacca.zip | |
now that we have no global arrays we can start to split up the monster
server.c without breaking things.
this splits off netprot.c and fileio.c for negprot and read/write/seek
handling respectively.
(This used to be commit b3d7014643ec9f2eef6e6f598f5b9db1fe2f930d)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 20 | ||||
| -rw-r--r-- | source3/include/smb.h | 7 |
2 files changed, 19 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 4c7c625397..667fc01a3b 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1960,6 +1960,12 @@ void DirCacheAdd( char *path, char *name, char *dname, int snum ); char *DirCacheCheck( char *path, char *name, int snum ); void DirCacheFlush(int snum); +/*The following definitions come from smbd/fileio.c */ + +int seek_file(files_struct *fsp,uint32 pos); +int read_file(files_struct *fsp,char *data,uint32 pos,int n); +int write_file(files_struct *fsp,char *data,int n); + /*The following definitions come from smbd/files.c */ files_struct *file_new(void ); @@ -2005,6 +2011,12 @@ int reply_sendtxt(connection_struct *conn, int reply_sendend(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize); +/*The following definitions come from smbd/negprot.c */ + +int reply_negprot(connection_struct *conn, + char *inbuf,char *outbuf, int dum_size, + int dum_buffsize); + /*The following definitions come from smbd/nttrans.c */ int reply_ntcreate_and_X(connection_struct *conn, @@ -2159,9 +2171,6 @@ int check_share_mode( share_mode_entry *share, int deny_mode, char *fname, BOOL fcbopen, int *flags); void open_file_shared(files_struct *fsp,connection_struct *conn,char *fname,int share_mode,int ofun, int mode,int oplock_request, int *Access,int *action); -int seek_file(files_struct *fsp,uint32 pos); -int read_file(files_struct *fsp,char *data,uint32 pos,int n); -int write_file(files_struct *fsp,char *data,int n); BOOL become_service(connection_struct *conn,BOOL do_chdir); int find_service(char *service); int cached_error_packet(char *inbuf,char *outbuf,files_struct *fsp,int line); @@ -2174,11 +2183,6 @@ BOOL receive_next_smb(int smbfd, int oplockfd, char *inbuf, int bufsize, int tim BOOL reload_services(BOOL test); connection_struct *make_connection(char *service,char *user,char *password, int pwlen, char *dev,uint16 vuid, int *ecode); BOOL attempt_close_oplocked_file(files_struct *fsp); -int reply_corep(char *outbuf); -int reply_coreplus(char *outbuf); -int reply_lanman1(char *outbuf); -int reply_lanman2(char *outbuf); -int reply_nt1(char *outbuf); void close_cnum(connection_struct *conn, uint16 vuid); void exit_server(char *reason); char *smb_fn_name(int type); diff --git a/source3/include/smb.h b/source3/include/smb.h index c68f88cbdd..e88737f046 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -200,6 +200,13 @@ implemented */ #define aDIR (1L<<4) #define aARCH (1L<<5) +/* for readability... */ +#define IS_DOS_READONLY(test_mode) (((test_mode) & aRONLY) != 0) +#define IS_DOS_DIR(test_mode) (((test_mode) & aDIR) != 0) +#define IS_DOS_ARCHIVE(test_mode) (((test_mode) & aARCH) != 0) +#define IS_DOS_SYSTEM(test_mode) (((test_mode) & aSYSTEM) != 0) +#define IS_DOS_HIDDEN(test_mode) (((test_mode) & aHIDDEN) != 0) + /* deny modes */ #define DENY_DOS 0 #define DENY_ALL 1 |