diff options
| author | Günther Deschner <gd@samba.org> | 2004-11-01 19:35:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:07 -0500 |
| commit | 3688bb079e8d817dcfc3b9e5eb9d07e7b95a806f (patch) | |
| tree | 209d15ea6bdd1248218763a4be32e18fbed73bd8 /source3 | |
| parent | 7cb23bf74df9b7870dd7886d5a92da05339b923f (diff) | |
| download | samba-3688bb079e8d817dcfc3b9e5eb9d07e7b95a806f.tar.gz samba-3688bb079e8d817dcfc3b9e5eb9d07e7b95a806f.tar.bz2 samba-3688bb079e8d817dcfc3b9e5eb9d07e7b95a806f.zip | |
r3439: Finally fix build for platforms without kerberos.
Guenther
(This used to be commit 05619cfdbf814e5c79e65934b82424eca00c76c4)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libads/kerberos.c | 4 | ||||
| -rw-r--r-- | source3/libsmb/clikrb5.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index dc1edb3cde..6004bc8098 100644 --- a/source3/libads/kerberos.c +++ b/source3/libads/kerberos.c @@ -247,7 +247,7 @@ krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context, Setting principal to NULL deletes this entry. ************************************************************************/ -BOOL kerberos_secrets_store_salting_principal(const char *service, + BOOL kerberos_secrets_store_salting_principal(const char *service, int enctype, const char *principal) { @@ -602,7 +602,7 @@ static void kerberos_derive_salting_principal_for_enctype(const char *service_pr Go through all the possible enctypes for this principal. ************************************************************************/ -void kerberos_derive_salting_principal(krb5_context context, + void kerberos_derive_salting_principal(krb5_context context, krb5_ccache ccache, krb5_enctype *enctypes, char *service_principal) diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index af0273853f..5c5584763c 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -123,7 +123,7 @@ #error UNKNOWN_CREATE_KEY_FUNCTIONS #endif -int create_kerberos_key_from_string(krb5_context context, + int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, @@ -272,7 +272,7 @@ int create_kerberos_key_from_string(krb5_context context, } #endif -void kerberos_free_data_contents(krb5_context context, krb5_data *pdata) + void kerberos_free_data_contents(krb5_context context, krb5_data *pdata) { #if defined(HAVE_KRB5_FREE_DATA_CONTENTS) if (pdata->data) { @@ -283,7 +283,7 @@ void kerberos_free_data_contents(krb5_context context, krb5_data *pdata) #endif } -void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype) + void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype) { #if defined(HAVE_KRB5_KEYBLOCK_IN_CREDS) KRB5_KEY_TYPE((&pcreds->keyblock)) = enctype; @@ -294,7 +294,7 @@ void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype) #endif } -BOOL kerberos_compatible_enctypes(krb5_context context, + BOOL kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1, krb5_enctype enctype2) { |