diff options
| author | Günther Deschner <gd@samba.org> | 2014-04-30 10:46:20 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-08-08 06:02:34 +0200 |
| commit | 5c663685ebbb14cc8eca49e9e9554c2dae2e9764 (patch) | |
| tree | 08114a61e297792c302ca6f84bcfbfd80a5e8b56 | |
| parent | fb2a8b34c17a68da6f0712d83b55084efaa76e52 (diff) | |
| download | samba-5c663685ebbb14cc8eca49e9e9554c2dae2e9764.tar.gz samba-5c663685ebbb14cc8eca49e9e9554c2dae2e9764.tar.xz samba-5c663685ebbb14cc8eca49e9e9554c2dae2e9764.zip | |
lib/krb5_wrap: move krb5_princ_size replacement code to lib/krb5_wrap/krb5_samba.c.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | lib/krb5_wrap/krb5_samba.h | 8 | ||||
| -rw-r--r-- | source4/auth/kerberos/kerberos.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index ee06f556e3..f5a2daa077 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -308,6 +308,14 @@ int smb_krb5_create_key_from_string(krb5_context context, krb5_boolean smb_krb5_get_allowed_weak_crypto(krb5_context context); +#ifndef krb5_princ_size +#if defined(HAVE_KRB5_PRINCIPAL_GET_NUM_COMP) +#define krb5_princ_size krb5_principal_get_num_comp +#else +#error krb5_princ_size unavailable +#endif +#endif + #endif /* HAVE_KRB5 */ int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx, diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h index 45975f16f3..b71762ddbd 100644 --- a/source4/auth/kerberos/kerberos.h +++ b/source4/auth/kerberos/kerberos.h @@ -75,14 +75,6 @@ krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_con const krb5_data *krb5_princ_component(krb5_context context, krb5_principal principal, int i ); #endif -#ifndef krb5_princ_size -#if defined(HAVE_KRB5_PRINCIPAL_GET_NUM_COMP) -#define krb5_princ_size krb5_principal_get_num_comp -#else -#error krb5_princ_size unavailable -#endif -#endif - /* Samba wrapper function for krb5 functionality. */ krb5_error_code kerberos_encode_pac(TALLOC_CTX *mem_ctx, struct PAC_DATA *pac_data, |