Attachment 3459 Details for Bug 5675 – Final patch

[patch] Final patch

look (text/plain), 2.02 KB, created by Jeremy Allison on 2008-08-07 19:55:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2008-08-07 19:55:49 UTC

Size: 2.02 KB

patch

obsolete

>diff --git a/source/client/smbspool.c b/source/client/smbspool.c
>index e567ef8..f35a9d3 100644
>--- a/source/client/smbspool.c
>+++ b/source/client/smbspool.c
>@@ -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);
>diff --git a/source/include/client.h b/source/include/client.h
>index 9276948..51ced99 100644
>--- a/source/include/client.h
>+++ b/source/include/client.h
>@@ -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? */
>diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c
>index 4285753..8ef14d7 100644
>--- a/source/libsmb/cliconnect.c
>+++ b/source/libsmb/cliconnect.c
>@@ -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) {

Actions: View

Attachments on bug 5675: 3458 | 3459