From 87e6d7eab1fa81df51c48a7f9272a07f26ede463 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 17 Mar 2008 15:22:52 +1100 Subject: Don't require users of credentials.h to have krb5.h and gssapi.h Rather than require users of Samba4's headers to have krb5-devel installed (presumably in their system paths), don't expose the minor functions which require this by default. Andrew Bartlett (This used to be commit f14737e4d2040d2f401a3b20c5e78d0d793cfc3a) --- source4/auth/credentials/credentials.h | 5 ++++- source4/auth/credentials/credentials_krb5.c | 8 ++++---- source4/auth/credentials/credentials_krb5.h | 14 ++++++++++++-- source4/auth/kerberos/kerberos_util.c | 8 ++++---- 4 files changed, 24 insertions(+), 11 deletions(-) (limited to 'source4/auth') 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 #include -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; -- cgit From dc49ae599eacd6c118dc355609bca657b05c5dee Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 25 Mar 2008 15:25:13 +1100 Subject: Remove useless extra argument to samdb_result_account_expires(). Andrew Bartlett (This used to be commit bc607c334ff86624b891886a6f874da2bcff113e) --- source4/auth/sam.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/auth') diff --git a/source4/auth/sam.c b/source4/auth/sam.c index 882196343c..b171fc57b9 100644 --- a/source4/auth/sam.c +++ b/source4/auth/sam.c @@ -157,7 +157,7 @@ _PUBLIC_ NTSTATUS authsam_account_ok(TALLOC_CTX *mem_ctx, acct_flags = samdb_result_acct_flags(sam_ctx, mem_ctx, msg, domain_dn); - acct_expiry = samdb_result_account_expires(msg, 0); + acct_expiry = samdb_result_account_expires(msg); /* Check for when we must change this password, taking the * userAccountControl flags into account */ @@ -351,7 +351,7 @@ _PUBLIC_ NTSTATUS authsam_make_server_info(TALLOC_CTX *mem_ctx, struct ldb_conte server_info->last_logon = samdb_result_nttime(msg, "lastLogon", 0); server_info->last_logoff = samdb_result_nttime(msg, "lastLogoff", 0); - server_info->acct_expiry = samdb_result_account_expires(msg, 0); + server_info->acct_expiry = samdb_result_account_expires(msg); server_info->last_password_change = samdb_result_nttime(msg, "pwdLastSet", 0); ncname = samdb_result_dn(sam_ctx, mem_ctx, msg_domain_ref, "nCName", NULL); -- cgit