sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3-krb5: Remove GSS_WRAP_IOV conditional

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

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-03-11 06:44:17 +11:00
parent 9e22b096cc
commit 49bb7f248a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/auth/auth_generic.c
View File

@ -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

4
source3/librpc/crypto/gse.c
View File

@ -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 */

2
source3/libsmb/auth_generic.c
View File

@ -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

2
source3/utils/ntlm_auth.c
View File

@ -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