diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-11 06:44:17 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-03-15 09:29:02 +1100 |
| commit | 49bb7f248a2059dc15636db0d4c00653eab7197c (patch) | |
| tree | ccd199a72a5fcced01c2f9c1f3a78c930c38bc4e | |
| parent | 9e22b096ccded46c5b35b7315ea671bde0407437 (diff) | |
| download | samba-49bb7f248a2059dc15636db0d4c00653eab7197c.tar.gz samba-49bb7f248a2059dc15636db0d4c00653eab7197c.tar.bz2 samba-49bb7f248a2059dc15636db0d4c00653eab7197c.zip | |
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
| -rw-r--r-- | source3/auth/auth_generic.c | 2 | ||||
| -rw-r--r-- | source3/librpc/crypto/gse.c | 4 | ||||
| -rw-r--r-- | source3/libsmb/auth_generic.c | 2 | ||||
| -rw-r--r-- | source3/utils/ntlm_auth.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source3/auth/auth_generic.c b/source3/auth/auth_generic.c index 43baab58ff..f99d390edd 100644 --- 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 9c18443206..3571dfd062 100644 --- 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 d38c11cb47..dbd87fff2b 100644 --- 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 2216816bb4..6fc772e67c 100644 --- 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 |