diff options
| author | Stefan Metzmacher <metze@samba.org> | 2015-06-22 15:17:33 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-06-23 14:38:53 +0200 |
| commit | 57579453d12429adba08b80c1eb6936cc422a2fd (patch) | |
| tree | b16122c9590b2ad43778b2226b3ea28f91c4c035 /auth/credentials/credentials_krb5.c | |
| parent | 01499617bdd7f7b202ddd1e1c35e21b5c042ac65 (diff) | |
| download | samba-57579453d12429adba08b80c1eb6936cc422a2fd.tar.gz | |
auth/credentials: use HAVE_GSS_KRB5_CRED_NO_CI_FLAGS_X instead of SAMBA4_USES_HEIMDAL
Newer MIT versions also have this.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'auth/credentials/credentials_krb5.c')
| -rw-r--r-- | auth/credentials/credentials_krb5.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/auth/credentials/credentials_krb5.c b/auth/credentials/credentials_krb5.c index 77dbcd2c061..d6aaae6cde4 100644 --- a/auth/credentials/credentials_krb5.c +++ b/auth/credentials/credentials_krb5.c @@ -518,7 +518,7 @@ _PUBLIC_ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred, OM_uint32 maj_stat, min_stat; struct gssapi_creds_container *gcc; 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; #endif 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 */ maj_stat = gss_set_cred_option(&min_stat, &gcc->creds, GSS_KRB5_CRED_NO_CI_FLAGS_X, |