diff options
Diffstat (limited to 'source4/auth/kerberos')
-rw-r--r-- | source4/auth/kerberos/config.mk | 2 | ||||
-rw-r--r-- | source4/auth/kerberos/kerberos.h | 12 | ||||
-rw-r--r-- | source4/auth/kerberos/kerberos_pac.c | 2 | ||||
-rw-r--r-- | source4/auth/kerberos/kerberos_util.c | 1 | ||||
-rw-r--r-- | source4/auth/kerberos/kerberos_verify.c | 6 |
5 files changed, 6 insertions, 17 deletions
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk index f65ebec63a..689130d567 100644 --- a/source4/auth/kerberos/config.mk +++ b/source4/auth/kerberos/config.mk @@ -10,6 +10,6 @@ OBJ_FILES = kerberos.o \ gssapi_parse.o \ krb5_init_context.o PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE -PRIVATE_DEPENDENCIES = ASN1_UTIL HEIMDAL_ROKEN_ADDRINFO auth_sam +PRIVATE_DEPENDENCIES = ASN1_UTIL HEIMDAL_ROKEN_ADDRINFO auth_sam CREDENTIALS_KRB5 # End SUBSYSTEM KERBEROS ################################# diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h index 3e724c29a5..b82dd3f75a 100644 --- a/source4/auth/kerberos/kerberos.h +++ b/source4/auth/kerberos/kerberos.h @@ -21,23 +21,17 @@ #if defined(HAVE_KRB5) -#include "auth/credentials/credentials.h" #include "auth/kerberos/krb5_init_context.h" #include "librpc/gen_ndr/krb5pac.h" struct auth_serversupplied_info; +struct cli_credentials; struct ccache_container { struct smb_krb5_context *smb_krb5_context; krb5_ccache ccache; }; - -struct gssapi_creds_container { - gss_cred_id_t creds; -}; - - struct keytab_container { struct smb_krb5_context *smb_krb5_context; krb5_keytab keytab; @@ -159,10 +153,6 @@ NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx, time_t tgs_authtime, DATA_BLOB *pac); - int cli_credentials_set_client_gss_creds(struct cli_credentials *cred, - gss_cred_id_t gssapi_cred, - enum credentials_obtained obtained); - #include "auth/kerberos/proto.h" #endif /* HAVE_KRB5 */ diff --git a/source4/auth/kerberos/kerberos_pac.c b/source4/auth/kerberos/kerberos_pac.c index 0be0ebaad7..dcfe16c896 100644 --- a/source4/auth/kerberos/kerberos_pac.c +++ b/source4/auth/kerberos/kerberos_pac.c @@ -28,7 +28,7 @@ #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" #include "librpc/gen_ndr/ndr_krb5pac.h" -#include "auth/auth.h" +#include "lib/ldb/include/ldb.h" #include "auth/auth_sam.h" static krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx, diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c index 02d5cf8a99..66002e2f71 100644 --- a/source4/auth/kerberos/kerberos_util.c +++ b/source4/auth/kerberos/kerberos_util.c @@ -25,6 +25,7 @@ #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" #include "auth/credentials/credentials.h" +#include "auth/credentials/credentials_krb5.h" struct principal_container { struct smb_krb5_context *smb_krb5_context; diff --git a/source4/auth/kerberos/kerberos_verify.c b/source4/auth/kerberos/kerberos_verify.c index 29d704b148..2111e22aa3 100644 --- a/source4/auth/kerberos/kerberos_verify.c +++ b/source4/auth/kerberos/kerberos_verify.c @@ -26,8 +26,8 @@ #include "includes.h" #include "system/kerberos.h" #include "auth/kerberos/kerberos.h" - -#ifdef HAVE_KRB5 +#include "auth/credentials/credentials.h" +#include "auth/credentials/credentials_krb5.h" /********************************************************************************** Verify an incoming ticket and parse out the principal name and @@ -100,5 +100,3 @@ return NT_STATUS_OK; } - -#endif /* HAVE_KRB5 */ |