summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-02-02 11:11:24 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-02-02 11:11:24 +0000
commit809bb276adfbe71d2f7461c9f6ee4da68ab68d84 (patch)
tree9a477542d9b914fd49a6f797b41640c73cddb128
parent28e3e4843194e2559714adc03e05c43f9328aeda (diff)
downloadsamba-809bb276adfbe71d2f7461c9f6ee4da68ab68d84.tar.gz
samba-809bb276adfbe71d2f7461c9f6ee4da68ab68d84.tar.bz2
samba-809bb276adfbe71d2f7461c9f6ee4da68ab68d84.zip
Add some return values, and don't attempt signing for NTLMSSP yet (it uses a
different algorithm). Andrew Bartlett (This used to be commit e6f87c7ee5c61f03f81159a8017d31f439c4454a)
-rw-r--r--source3/libsmb/cliconnect.c4
-rw-r--r--source3/libsmb/clientgen.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index c13881bc21..ebe19b5143 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -464,7 +464,7 @@ static BOOL cli_session_setup_ntlmssp(struct cli_state *cli, const char *user,
pstring server_domain; /* FIX THIS, SHOULD be UCS2-LE */
neg_flags = NTLMSSP_NEGOTIATE_UNICODE |
- NTLMSSP_NEGOTIATE_128 |
+ NTLMSSP_NEGOTIATE_128 |
NTLMSSP_NEGOTIATE_NTLM |
NTLMSSP_REQUEST_TARGET;
@@ -573,8 +573,6 @@ static BOOL cli_session_setup_ntlmssp(struct cli_state *cli, const char *user,
if (cli_is_error(cli))
return False;
- set_signing_on_cli(cli, pass, nthash);
-
return True;
}
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index b35c7ea2ed..ab051426ae 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -119,7 +119,9 @@ BOOL cli_receive_smb(struct cli_state *cli)
if (!cli_check_sign_mac(cli)) {
DEBUG(0, ("SMB Signiture verification failed on incoming packet!\n"));
+ return False;
};
+ return True;
}
/****************************************************************************