sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

Fix bug #5675 with a varient of Tim Waugh's patch,

Browse Source 
as proposed by James Peach.
Jeremy.
This commit is contained in:
Jeremy Allison 2008-08-07 17:55:57 -07:00
parent 5abd12eec1
commit 5c27ad7583
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/smbspool.c
View File

@ -347,7 +347,7 @@ get_exit_code(struct cli_state * cli,
}
if (cli) {
if (cli->use_kerberos || (cli->capabilities & CAP_EXTENDED_SECURITY))
if (cli->use_kerberos && cli->got_kerberos_mechanism)
fputs("ATTR: auth-info-required=negotiate\n", stderr);
else
fputs("ATTR: auth-info-required=username,password\n", stderr);

1
source/include/client.h
View File

@ -193,6 +193,7 @@ struct cli_state {
bool use_kerberos;
bool fallback_after_kerberos;
bool use_spnego;
bool got_kerberos_mechanism; /* Server supports krb5 in SPNEGO. */
bool use_oplocks; /* should we use oplocks? */
bool use_level_II_oplocks; /* should we use level II oplocks? */

5
source/libsmb/cliconnect.c
View File

@ -797,7 +797,6 @@ ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user,
char *principal = NULL;
char *OIDs[ASN1_MAX_OIDS];
int i;
bool got_kerberos_mechanism = False;
DATA_BLOB blob;
const char *p = NULL;
char *account = NULL;
@ -832,7 +831,7 @@ ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user,
DEBUG(3,("got OID=%s\n", OIDs[i]));
if (strcmp(OIDs[i], OID_KERBEROS5_OLD) == 0 ||
strcmp(OIDs[i], OID_KERBEROS5) == 0) {
got_kerberos_mechanism = True;
cli->got_kerberos_mechanism = True;
}
free(OIDs[i]);
}
@ -845,7 +844,7 @@ ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user,
/* If password is set we reauthenticate to kerberos server
* and do not store results */
if (got_kerberos_mechanism && cli->use_kerberos) {
if (cli->got_kerberos_mechanism && cli->use_kerberos) {
ADS_STATUS rc;
if (pass && *pass) {