diff options
| -rw-r--r-- | source4/auth/credentials/credentials.h | 5 | ||||
| -rw-r--r-- | source4/auth/credentials/credentials_krb5.c | 8 | ||||
| -rw-r--r-- | source4/auth/credentials/credentials_krb5.h | 14 | ||||
| -rw-r--r-- | source4/auth/kerberos/kerberos_util.c | 8 |
4 files changed, 24 insertions, 11 deletions
diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h index a3da5c6054..1b205c61ce 100644 --- a/source4/auth/credentials/credentials.h +++ b/source4/auth/credentials/credentials.h @@ -128,7 +128,10 @@ struct cli_credentials { struct ldb_context; struct loadparm_context; -#include "auth/credentials/credentials_krb5.h" +struct ccache_container; + +struct gssapi_creds_container; + #include "auth/credentials/credentials_proto.h" #endif /* __CREDENTIALS_H__ */ diff --git a/source4/auth/credentials/credentials_krb5.c b/source4/auth/credentials/credentials_krb5.c index 90b196e99e..52bf9f124f 100644 --- a/source4/auth/credentials/credentials_krb5.c +++ b/source4/auth/credentials/credentials_krb5.c @@ -400,10 +400,10 @@ int cli_credentials_get_client_gss_creds(struct cli_credentials *cred, to the credentials system. */ -int cli_credentials_set_client_gss_creds(struct cli_credentials *cred, - struct loadparm_context *lp_ctx, - gss_cred_id_t gssapi_cred, - enum credentials_obtained obtained) + int cli_credentials_set_client_gss_creds(struct cli_credentials *cred, + struct loadparm_context *lp_ctx, + gss_cred_id_t gssapi_cred, + enum credentials_obtained obtained) { int ret; OM_uint32 maj_stat, min_stat; diff --git a/source4/auth/credentials/credentials_krb5.h b/source4/auth/credentials/credentials_krb5.h index b963fbdca4..aaa7d7f0da 100644 --- a/source4/auth/credentials/credentials_krb5.h +++ b/source4/auth/credentials/credentials_krb5.h @@ -26,10 +26,20 @@ #include <gssapi/gssapi.h> #include <krb5.h> -struct ccache_container; - struct gssapi_creds_container { gss_cred_id_t creds; }; +/* Manually prototyped here to avoid needing gss headers in most callers */ +int cli_credentials_set_client_gss_creds(struct cli_credentials *cred, + struct loadparm_context *lp_ctx, + gss_cred_id_t gssapi_cred, + enum credentials_obtained obtained); + +/* Manually prototyped here to avoid needing krb5 headers in most callers */ +krb5_error_code principal_from_credentials(TALLOC_CTX *parent_ctx, + struct cli_credentials *credentials, + struct smb_krb5_context *smb_krb5_context, + krb5_principal *princ); + #endif /* __CREDENTIALS_KRB5_H__ */ diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c index 70e2961d55..e905e3e704 100644 --- a/source4/auth/kerberos/kerberos_util.c +++ b/source4/auth/kerberos/kerberos_util.c @@ -101,10 +101,10 @@ static krb5_error_code salt_principal_from_credentials(TALLOC_CTX *parent_ctx, * the library routines. The returned princ is placed in the talloc * system by means of a destructor (do *not* free). */ -krb5_error_code principal_from_credentials(TALLOC_CTX *parent_ctx, - struct cli_credentials *credentials, - struct smb_krb5_context *smb_krb5_context, - krb5_principal *princ) + krb5_error_code principal_from_credentials(TALLOC_CTX *parent_ctx, + struct cli_credentials *credentials, + struct smb_krb5_context *smb_krb5_context, + krb5_principal *princ) { krb5_error_code ret; const char *princ_string; |