diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-10-22 06:48:35 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-10-22 06:48:35 +0000 |
| commit | 4ccdb15532ef707dea44e2c7316e2a3334abab86 (patch) | |
| tree | c7d46bee004079befa68be807ae1ff7fd2c59116 /source3/libsmb | |
| parent | f78a8a613f21b44dc6d77977aab2ee9e0fc27e23 (diff) | |
| download | samba-4ccdb15532ef707dea44e2c7316e2a3334abab86.tar.gz samba-4ccdb15532ef707dea44e2c7316e2a3334abab86.tar.bz2 samba-4ccdb15532ef707dea44e2c7316e2a3334abab86.zip | |
a quick fix to get rpcclient working again. This just disables
NTLMSSP in cli_establish_connection()
What we really need to do is kill off the pwd_cache code. It is horrible,
and assumes the challenge comes in the negprot reply.
(This used to be commit 3f919b4360b3bfcc133f7d88bc5177e9d93f2db2)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 4 | ||||
| -rw-r--r-- | source3/libsmb/clientgen.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index dc8c7c2957..2dad0247b2 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -1087,6 +1087,10 @@ BOOL cli_establish_connection(struct cli_state *cli, return False; } + /* cli_establish_connection() can't handle spnego yet. Once we get rid of + pwd_cache and other horrors we can get rid of this */ + cli->use_spnego = False; + if (cli->fd == -1) { if (!cli_connect(cli, dest_host, dest_ip)) diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index ed0bc6481e..ec8d2e2bfc 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -112,7 +112,9 @@ void cli_setup_packet(struct cli_state *cli) if (cli->capabilities & CAP_STATUS32) { flags2 |= FLAGS2_32_BIT_ERROR_CODES; } - flags2 |= FLAGS2_EXTENDED_SECURITY; + if (cli->use_spnego) { + flags2 |= FLAGS2_EXTENDED_SECURITY; + } SSVAL(cli->outbuf,smb_flg2, flags2); } } @@ -179,6 +181,7 @@ struct cli_state *cli_initialise(struct cli_state *cli) cli->outbuf = (char *)malloc(cli->bufsize); cli->inbuf = (char *)malloc(cli->bufsize); cli->oplock_handler = cli_oplock_ack; + cli->use_spnego = True; if (!cli->outbuf || !cli->inbuf) goto error; |