sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

auth/credentials: use HAVE_GSS_KRB5_CRED_NO_CI_FLAGS_X instead of SAMBA4_USES_HEIMDAL

Browse Source 
Newer MIT versions also have this.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
This commit is contained in:
Stefan Metzmacher 2015-06-22 15:17:33 +02:00
parent 01499617bd
commit 57579453d1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
auth/credentials/credentials_krb5.c
View File

@ -518,7 +518,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
OM_uint32 maj_stat, min_stat; OM_uint32 maj_stat, min_stat;
struct gssapi_creds_container *gcc; struct gssapi_creds_container *gcc;
struct ccache_container *ccache; struct ccache_container *ccache;
#ifdef SAMBA4_USES_HEIMDAL #ifdef HAVE_GSS_KRB5_CRED_NO_CI_FLAGS_X
gss_buffer_desc empty_buffer = GSS_C_EMPTY_BUFFER; gss_buffer_desc empty_buffer = GSS_C_EMPTY_BUFFER;
#endif #endif
krb5_enctype *etypes = NULL; krb5_enctype *etypes = NULL;
@ -634,8 +634,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred,
} }
} }
#ifdef SAMBA4_USES_HEIMDAL /* MIT lacks GSS_KRB5_CRED_NO_CI_FLAGS_X */ #ifdef HAVE_GSS_KRB5_CRED_NO_CI_FLAGS_X
/* don't force GSS_C_CONF_FLAG and GSS_C_INTEG_FLAG */ /* don't force GSS_C_CONF_FLAG and GSS_C_INTEG_FLAG */
maj_stat = gss_set_cred_option(&min_stat, &gcc->creds, maj_stat = gss_set_cred_option(&min_stat, &gcc->creds,
GSS_KRB5_CRED_NO_CI_FLAGS_X, GSS_KRB5_CRED_NO_CI_FLAGS_X,