diff options
| author | Luke Leighton <lkcl@samba.org> | 1999-10-25 16:22:08 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1999-10-25 16:22:08 +0000 |
| commit | 8e1f542ddf97fef925a88e2c3d9c1e82fb2f6683 (patch) | |
| tree | cb9e0bdd8f96a41cf6b460017a3772ea7e1dc5d3 /source3/libsmb | |
| parent | 45b794bdde0cb906216425c8fc2af8610aa8ad3c (diff) | |
| download | samba-8e1f542ddf97fef925a88e2c3d9c1e82fb2f6683.tar.gz samba-8e1f542ddf97fef925a88e2c3d9c1e82fb2f6683.tar.bz2 samba-8e1f542ddf97fef925a88e2c3d9c1e82fb2f6683.zip | |
one of those wonderful moments when running against a different MSRPC
implementation (NT5) when you discover that your code is trash.
samr_enum_dom_users(), samr_enum_dom_aliases() and samr_enum_dom_groups()
all take a HANDLE for multiple-call enumeration purposes.
(This used to be commit 19490d8b4fb8a103f3df4e6104f6f22937b0c518)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/clientgen.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 90ea3d12bf..d792eeeaa1 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -255,10 +255,10 @@ static void cli_setup_packet(struct cli_state *cli) uint16 flgs2 = 0; flgs2 |= FLAGS2_LONG_PATH_COMPONENTS; flgs2 |= FLAGS2_32_BIT_ERROR_CODES; + flgs2 |= FLAGS2_EXT_SEC; #if 0 flgs2 |= FLAGS2_UNICODE_STRINGS; #endif - flgs2 |= FLAGS2_EXT_SEC; cli->rap_error = 0; cli->nt_error = 0; @@ -750,8 +750,6 @@ prots[] = {PROTOCOL_LANMAN2,"Samba"}, {PROTOCOL_NT1,"NT LANMAN 1.0"}, {PROTOCOL_NT1,"NT LM 0.12"}, -#if 0 -#endif {-1,NULL} }; @@ -842,7 +840,7 @@ BOOL cli_session_setup_x(struct cli_state *cli, SIVAL(cli->outbuf,smb_vwv5,cli->sesskey); SSVAL(cli->outbuf,smb_vwv7,passlen); SSVAL(cli->outbuf,smb_vwv8,ntpasslen); - SSVAL(cli->outbuf,smb_vwv11,0); + SIVAL(cli->outbuf,smb_vwv11, CAP_STATUS32); p = smb_buf(cli->outbuf); memcpy(p,pass,passlen); p += SVAL(cli->outbuf,smb_vwv7); @@ -3091,7 +3089,17 @@ BOOL cli_establish_connection(struct cli_state *cli, #endif prs_init(&auth_resp, 1024, 4, SAFETY_MARGIN, False); - pwd_make_lm_nt_owf(&cli->pwd, cli->cryptkey); + if (cli->use_ntlmv2 != False) + { + DEBUG(10,("cli_establish_connection: NTLMv2\n")); + pwd_make_lm_nt_owf2(&(cli->pwd), cli->cryptkey, + cli->user_name, calling->name, cli->domain); + } + else + { + DEBUG(10,("cli_establish_connection: NTLMv1\n")); + pwd_make_lm_nt_owf(&(cli->pwd), cli->cryptkey); + } create_ntlmssp_resp(&cli->pwd, cli->domain, cli->user_name, cli->calling.name, |