sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-31 17:18:04 +03:00
Code

move where got_sig_term and reload_after_sighup are defined.

Browse Source 
populate cli structure with called name and calling name even for port
445 connects.
This commit is contained in:
Herb Lewis 0001-01-01 00:00:00 +00:00
parent 26fc20187d
commit 123eee6206
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/libsmb/cliconnect.c
View File

@ -938,15 +938,6 @@ BOOL cli_session_request(struct cli_state *cli,
int len = 4;
extern pstring user_socket_options;
/* 445 doesn't have session request */
if (cli->port == 445) return True;
if (cli->sign_info.use_smb_signing) {
DEBUG(0, ("Cannot send session resquest again, particularly after setting up SMB Signing\n"));
return False;
}
/* send a session request (RFC 1002) */
memcpy(&(cli->calling), calling, sizeof(*calling));
memcpy(&(cli->called ), called , sizeof(*called ));
@ -960,6 +951,15 @@ BOOL cli_session_request(struct cli_state *cli,
name_mangle(cli->calling.name, p, cli->calling.name_type);
len += name_len(p);
/* 445 doesn't have session request */
if (cli->port == 445) return True;
if (cli->sign_info.use_smb_signing) {
DEBUG(0, ("Cannot send session resquest again, particularly after setting up SMB Signing\n"));
return False;
}
/* send a session request (RFC 1002) */
/* setup the packet length
* Remove four bytes from the length count, since the length
* field in the NBT Session Service header counts the number

4
source/smbd/process.c
View File

@ -42,8 +42,8 @@ extern int last_message;
extern int global_oplock_break;
extern userdom_struct current_user_info;
extern int smb_read_error;
extern SIG_ATOMIC_T reload_after_sighup;
extern SIG_ATOMIC_T got_sig_term;
SIG_ATOMIC_T reload_after_sighup = 0;
SIG_ATOMIC_T got_sig_term = 0;
extern BOOL global_machine_password_needs_changing;
extern fstring global_myworkgroup;
extern pstring global_myname;

6
source/smbd/server.c
View File

@ -33,6 +33,8 @@ int last_message = -1;
#define LAST_MESSAGE() smb_fn_name(last_message)
extern pstring user_socket_options;
extern SIG_ATOMIC_T got_sig_term;
extern SIG_ATOMIC_T reload_after_sighup;
#ifdef WITH_DFS
extern int dcelogin_atmost_once;
@ -61,8 +63,6 @@ static void smbd_set_server_fd(int fd)
Terminate signal.
****************************************************************************/
SIG_ATOMIC_T got_sig_term = 0;
static void sig_term(void)
{
got_sig_term = 1;
@ -73,8 +73,6 @@ static void sig_term(void)
Catch a sighup.
****************************************************************************/
SIG_ATOMIC_T reload_after_sighup = 0;
static void sig_hup(int sig)
{
reload_after_sighup = 1;