From: Stefan Metzmacher Date: Thu, 22 Dec 2016 07:47:32 +0000 (+0100) Subject: s3:librpc/gse: remove unused #ifdef HAVE_GSS_KRB5_IMPORT_CRED X-Git-Tag: samba-4.4.10~74 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=838be147f06303f48645908e6a40907a1a36e1f3;p=thirdparty%2Fsamba.git s3:librpc/gse: remove unused #ifdef HAVE_GSS_KRB5_IMPORT_CRED We always have gss_krb5_import_cred(), it available in heimdal and also the oldest version (1.9) of MIT krb5 that we support. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12480 Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider (cherry picked from commit b61a93755ca59a58775c1c8c21baee49fef42fbf) --- diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c index 3f1615d4a74..1ac581f5154 100644 --- a/source3/librpc/crypto/gse.c +++ b/source3/librpc/crypto/gse.c @@ -380,8 +380,6 @@ static NTSTATUS gse_init_server(TALLOC_CTX *mem_ctx, goto done; } -#ifdef HAVE_GSS_KRB5_IMPORT_CRED - /* This creates a GSSAPI cred_id_t with the keytab set */ gss_maj = gss_krb5_import_cred(&gss_min, NULL, NULL, gse_ctx->keytab, &gse_ctx->creds); @@ -400,7 +398,6 @@ static NTSTATUS gse_init_server(TALLOC_CTX *mem_ctx, * principal in request'. Work around the issue by * falling back to the alternate approach below. */ } else if (gss_maj == (GSS_S_CALL_BAD_STRUCTURE|GSS_S_BAD_NAME)) -#endif /* FIXME!!! * This call sets the default keytab for the whole server, not * just for this context. Need to find a way that does not alter