diff options
| author | Herb Lewis <herb@samba.org> | 2002-08-22 23:34:27 +0000 |
|---|---|---|
| committer | Herb Lewis <herb@samba.org> | 2002-08-22 23:34:27 +0000 |
| commit | e6de7c24a5d60f0481eef9695780890e360802f9 (patch) | |
| tree | d45f6b58b7b94a0b09ff3a8570720dffef14f767 /source3/libsmb/cliconnect.c | |
| parent | 89586f0b7c256c39a72dfac798e1882c97b24838 (diff) | |
| download | samba-e6de7c24a5d60f0481eef9695780890e360802f9.tar.gz samba-e6de7c24a5d60f0481eef9695780890e360802f9.tar.bz2 samba-e6de7c24a5d60f0481eef9695780890e360802f9.zip | |
move where got_sig_term and reload_after_sighup are defined.
populate cli structure with called name and calling name even for port
445 connects.
(This used to be commit 123eee6206d9afb28c169540dc63824957b505f4)
Diffstat (limited to 'source3/libsmb/cliconnect.c')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 73846c4d43..7db377c25f 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -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 |