s3-krb5: Remove GSS_WRAP_IOV conditional

We already confirm that we have this functionality before we set HAVE_KRB5 at
configure time.

Andrew Bartlett

diff --git a/source3/auth/auth_generic.c b/source3/auth/auth_generic.c
index 43baab58ff60d7dd0f8fbc5ab2624a7679c85054..f99d390edd118ece4ac26261d6b9ebe3890d9733 100644 (file)
--- a/source3/auth/auth_generic.c
+++ b/source3/auth/auth_generic.c
@@ -294,7 +294,7 @@ NTSTATUS auth_generic_prepare(TALLOC_CTX *mem_ctx,
 
                gensec_settings->backends[idx++] = gensec_security_by_oid(NULL, GENSEC_OID_NTLMSSP);
 
-#if defined(HAVE_KRB5) && defined(HAVE_GSS_WRAP_IOV)
+#if defined(HAVE_KRB5)
                gensec_settings->backends[idx++] = &gensec_gse_krb5_security_ops;
 #endif
 

diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c
index 9c18443206b0f24e94d6028c97dc77796cb91589..3571dfd062abf84c5a9869ddfd4041ac7f34d57e 100644 (file)
--- a/source3/librpc/crypto/gse.c
+++ b/source3/librpc/crypto/gse.c
@@ -30,7 +30,7 @@
 #include "../librpc/gen_ndr/dcerpc.h"
 #include "lib/util/asn1.h"
 
-#if defined(HAVE_KRB5) && defined(HAVE_GSS_WRAP_IOV)
+#if defined(HAVE_KRB5)
 
 #include "smb_krb5.h"
 #include "gse_krb5.h"
@@ -1180,4 +1180,4 @@ const struct gensec_security_ops gensec_gse_krb5_security_ops = {
        .priority       = GENSEC_GSSAPI
 };
 
-#endif /* HAVE_KRB5 && HAVE_GSS_WRAP_IOV */
+#endif /* HAVE_KRB5 */

diff --git a/source3/libsmb/auth_generic.c b/source3/libsmb/auth_generic.c
index d38c11cb47852a3e3f231e356aa50c46ff125a0e..dbd87fff2bcafedb698614627a435508d9c6a865 100644 (file)
--- a/source3/libsmb/auth_generic.c
+++ b/source3/libsmb/auth_generic.c
@@ -85,7 +85,7 @@ NTSTATUS auth_generic_client_prepare(TALLOC_CTX *mem_ctx, struct auth_generic_st
 
        gensec_settings->backends[idx++] = &gensec_ntlmssp3_client_ops;
 
-#if defined(HAVE_KRB5) && defined(HAVE_GSS_WRAP_IOV)
+#if defined(HAVE_KRB5)
        gensec_settings->backends[idx++] = &gensec_gse_krb5_security_ops;
 #endif
 

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 2216816bb48483274219435ae38295f901e6c3bc..6fc772e67cc32e5eb49f6691a65dbf634ef6b2fa 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -912,7 +912,7 @@ static NTSTATUS ntlm_auth_start_ntlmssp_server(TALLOC_CTX *mem_ctx,
        
        gensec_settings->backends[idx++] = gensec_security_by_oid(NULL, GENSEC_OID_NTLMSSP);
        
-#if defined(HAVE_KRB5) && defined(HAVE_GSS_WRAP_IOV)
+#if defined(HAVE_KRB5)
        gensec_settings->backends[idx++] = &gensec_gse_krb5_security_ops;
 #endif