diff options
| author | Volker Lendecke <vl@samba.org> | 2012-04-24 13:24:29 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2012-04-24 15:04:13 +0200 |
| commit | d38a171a43d3298d64adfa2a2869e84e560d3107 (patch) | |
| tree | f17eaab0cb32a9922ad38220e7796a2fab54fae4 | |
| parent | 374ca0bd26c0a5f1ab77497eafc1e98a420c86a5 (diff) | |
| download | samba-d38a171a43d3298d64adfa2a2869e84e560d3107.tar.gz samba-d38a171a43d3298d64adfa2a2869e84e560d3107.tar.bz2 samba-d38a171a43d3298d64adfa2a2869e84e560d3107.zip | |
s3: Attempt to fix the build without kerberos
Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Tue Apr 24 15:04:14 CEST 2012 on sn-devel-104
| -rw-r--r-- | lib/krb5_wrap/krb5_samba.h | 13 | ||||
| -rw-r--r-- | source3/libads/authdata.c | 3 | ||||
| -rw-r--r-- | source3/librpc/crypto/gse.c | 2 | ||||
| -rw-r--r-- | source3/utils/ntlm_auth.c | 3 |
4 files changed, 12 insertions, 9 deletions
diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index 70aebdb2c7..6a0f9dc2fd 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -210,18 +210,17 @@ char *smb_get_krb5_error_message(krb5_context context, krb5_error_code code, TALLOC_CTX *mem_ctx); -int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx, - const char *principal, time_t time_offset, - DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, - uint32_t extra_ap_opts, const char *ccname, - time_t *tgs_expire, - const char *impersonate_princ_s); - bool unwrap_edata_ntstatus(TALLOC_CTX *mem_ctx, DATA_BLOB *edata, DATA_BLOB *edata_out); #endif /* HAVE_KRB5 */ +int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx, + const char *principal, time_t time_offset, + DATA_BLOB *ticket, DATA_BLOB *session_key_krb5, + uint32_t extra_ap_opts, const char *ccname, + time_t *tgs_expire, + const char *impersonate_princ_s); #endif /* _KRB5_SAMBA_H */ diff --git a/source3/libads/authdata.c b/source3/libads/authdata.c index cb218dd7b2..f4ec5b9075 100644 --- a/source3/libads/authdata.c +++ b/source3/libads/authdata.c @@ -31,10 +31,11 @@ #include "librpc/crypto/gse.h" #include "auth/gensec/gensec.h" #include "../libcli/auth/spnego.h" -#include "auth/kerberos/pac_utils.h" #ifdef HAVE_KRB5 +#include "auth/kerberos/pac_utils.h" + struct smb_krb5_context; /**************************************************************** diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c index 96a1240554..a9c9c47410 100644 --- a/source3/librpc/crypto/gse.c +++ b/source3/librpc/crypto/gse.c @@ -28,10 +28,10 @@ #include "auth/gensec/gensec.h" #include "auth/credentials/credentials.h" #include "../librpc/gen_ndr/dcerpc.h" -#include "auth/kerberos/pac_utils.h" #if defined(HAVE_KRB5) +#include "auth/kerberos/pac_utils.h" #include "gse_krb5.h" static char *gse_errstr(TALLOC_CTX *mem_ctx, OM_uint32 maj, OM_uint32 min); diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index db9e4d0ff1..0f8e54460b 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -45,7 +45,10 @@ #include "source3/include/auth.h" #include "source3/auth/proto.h" #include "nsswitch/libwbclient/wbclient.h" + +#if HAVE_KRB5 #include "auth/kerberos/pac_utils.h" +#endif #ifndef PAM_WINBIND_CONFIG_FILE #define PAM_WINBIND_CONFIG_FILE "/etc/security/pam_winbind.conf" |