diff options
| author | Jeremy Allison <jra@samba.org> | 2005-01-24 20:21:15 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:55:10 -0500 |
| commit | c24c328a9e006473f4dba49fdf1842fb28952ec7 (patch) | |
| tree | 43fee66886e5699d379784db1267bc5433fefd17 /source3/libsmb/cliconnect.c | |
| parent | d1b7d109fa2b0c4a4b410ecf18b2f457cf90fcf5 (diff) | |
| download | samba-c24c328a9e006473f4dba49fdf1842fb28952ec7.tar.gz samba-c24c328a9e006473f4dba49fdf1842fb28952ec7.tar.bz2 samba-c24c328a9e006473f4dba49fdf1842fb28952ec7.zip | |
r4970: Fix for bug 2092, allowing fallback after kerberos and allow
gnome vfs to prevent auto-anonymous logon.
Jeremy.
(This used to be commit 843e85bcd978d025964c4d45d9a3886c7cf7f63c)
Diffstat (limited to 'source3/libsmb/cliconnect.c')
| -rw-r--r-- | source3/libsmb/cliconnect.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 659e124292..bffe9dfe8a 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -757,13 +757,17 @@ ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user, if (ret){ SAFE_FREE(principal); DEBUG(0, ("Kinit failed: %s\n", error_message(ret))); + if (cli->fallback_after_kerberos) + goto ntlmssp; return ADS_ERROR_KRB5(ret); } } rc = cli_session_setup_kerberos(cli, principal, domain); - SAFE_FREE(principal); - return rc; + if (ADS_ERR_OK(rc) || !cli->fallback_after_kerberos) { + SAFE_FREE(principal); + return rc; + } } #endif |