sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

move soem variables from server.c that don't belong there.

Browse Source
This commit is contained in:
Andrew Tridgell -
parent a6d194886a
commit f92475aa3c
4 changed files with 30 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/smbd/error.c
View File

@ -23,6 +23,10 @@
extern int DEBUGLEVEL;
/* these can be set by some functions to override the error codes */
int unix_ERR_class=SMB_SUCCESS;
int unix_ERR_code=0;
/****************************************************************************
create an error packet from a cached error.

14
source/smbd/oplock.c
View File

@ -23,11 +23,15 @@
extern int DEBUGLEVEL;
extern int oplock_sock;
extern uint16 oplock_port;
extern int32 global_oplocks_open;
extern int32 global_oplocks_open;
extern int global_oplock_break;
/* Oplock ipc UDP socket. */
int oplock_sock = -1;
uint16 oplock_port = 0;
/* Current number of oplocks we have outstanding. */
int32 global_oplocks_open = 0;
BOOL global_oplock_break = False;
extern int smb_read_error;

18
source/smbd/process.c
View File

@ -23,11 +23,24 @@
extern int DEBUGLEVEL;
time_t smb_last_time=(time_t)0;
/*
* Size of data we can send to client. Set
* by the client for all protocols above CORE.
* Set by us for CORE protocol.
*/
int max_send = BUFFER_SIZE;
/*
* Size of the data we can receive. Set by us.
* Can be modified by the max xmit parameter.
*/
int max_recv = BUFFER_SIZE;
extern int last_message;
extern int global_oplock_break;
extern pstring sesssetup_user;
extern char *last_inbuf;
extern time_t smb_last_time;
extern char *InBuffer;
extern char *OutBuffer;
extern int oplock_sock;
@ -645,6 +658,9 @@ void smbd_process(void)
}
#endif
max_recv = MIN(lp_maxxmit(),BUFFER_SIZE);
/* re-initialise the timezone */
TimeInit();

45
source/smbd/server.c
View File

@ -24,7 +24,6 @@
pstring servicesf = CONFIGFILE;
extern pstring debugf;
extern pstring sesssetup_user;
extern fstring global_myworkgroup;
extern pstring global_myname;
@ -42,14 +41,6 @@ int last_message = -1;
extern pstring scope;
extern int DEBUGLEVEL;
extern int case_default;
extern BOOL case_sensitive;
extern BOOL case_preserve;
extern BOOL use_mangled_map;
extern BOOL short_case_preserve;
extern BOOL case_mangle;
time_t smb_last_time=(time_t)0;
extern BOOL global_machine_pasword_needs_changing;
extern int smb_read_error;
@ -59,43 +50,9 @@ extern pstring user_socket_options;
extern int dcelogin_atmost_once;
#endif /* WITH_DFS */
/*
* This is set on startup - it defines the SID for this
* machine.
*/
extern DOM_SID global_machine_sid;
/*
* Size of data we can send to client. Set
* by the client for all protocols above CORE.
* Set by us for CORE protocol.
*/
int max_send = BUFFER_SIZE;
/*
* Size of the data we can receive. Set by us.
* Can be modified by the max xmit parameter.
*/
int max_recv = BUFFER_SIZE;
/* Oplock ipc UDP socket. */
int oplock_sock = -1;
uint16 oplock_port = 0;
/* Current number of oplocks we have outstanding. */
int32 global_oplocks_open = 0;
BOOL global_oplock_break = False;
extern fstring remote_machine;
extern pstring OriginalDir;
/* these can be set by some functions to override the error codes */
int unix_ERR_class=SMB_SUCCESS;
int unix_ERR_code=0;
extern int extra_time_offset;
extern pstring myhostname;
/****************************************************************************
@ -733,8 +690,6 @@ static void usage(char *pname)
/* possibly reload the services file. */
reload_services(True);
max_recv = MIN(lp_maxxmit(),BUFFER_SIZE);
if (*lp_rootdir())
{
if (sys_chroot(lp_rootdir()) == 0)