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

Don't require users of credentials.h to have krb5.h and gssapi.h

Browse Source 
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 f14737e4d2)
This commit is contained in:
Andrew Bartlett 2008-03-17 15:22:52 +11:00
parent e76c8aa097
commit 87e6d7eab1
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/auth/credentials/credentials.h
View File

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

8
source4/auth/credentials/credentials_krb5.c
View File

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

14
source4/auth/credentials/credentials_krb5.h
View File

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

8
source4/auth/kerberos/kerberos_util.c
View File

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