diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-05-30 17:41:51 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-05-30 12:55:39 +0200 |
| commit | 65bd5eb04bcd426833ba4a5cf424af9710f03f2e (patch) | |
| tree | 866454f7e463188321459ab69012b3337035d35f | |
| parent | 9cae92b48574d22e0d8e129ed6cb3d2ca20b6fc8 (diff) | |
| download | samba-65bd5eb04bcd426833ba4a5cf424af9710f03f2e.tar.gz samba-65bd5eb04bcd426833ba4a5cf424af9710f03f2e.tar.bz2 samba-65bd5eb04bcd426833ba4a5cf424af9710f03f2e.zip | |
lib/krb5_wrap: Move krb5_princ_size helper to source4 as it is only used there
This is also where the related krb5_princ_component is declared.
Also fix the configure check to use the correct name
This helps the autoconf build on Heimdal.
Andrew Bartlett
| -rw-r--r-- | lib/krb5_wrap/krb5_samba.h | 8 | ||||
| -rw-r--r-- | source4/auth/kerberos/kerberos.h | 8 | ||||
| -rwxr-xr-x | source4/heimdal_build/wscript_configure | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index 8d55a32f15..bd34879374 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -64,14 +64,6 @@ #define AP_OPTS_USE_SUBKEY 0 #endif -#ifndef krb5_princ_size -#if defined(HAVE_KRB5_KRB5_PRINCIPAL_GET_NUM_COMP) -#define krb5_princ_size krb5_principal_get_num_comp -#else -#error krb5_princ_size unavailable -#endif -#endif - typedef struct { #if defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) /* MIT */ krb5_address **addrs; diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h index 0be6d74a8b..707426d496 100644 --- a/source4/auth/kerberos/kerberos.h +++ b/source4/auth/kerberos/kerberos.h @@ -74,6 +74,14 @@ 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. */ NTSTATUS kerberos_pac_logon_info(TALLOC_CTX *mem_ctx, DATA_BLOB blob, diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index 31e0c5c23e..e8dab6800a 100755 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -154,7 +154,7 @@ conf.define('HAVE_ENCTYPE_ARCFOUR_HMAC', 1) conf.define('HAVE_KRB5_PDU_NONE_DECL', 1) conf.define('HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96', 1) conf.define('HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96', 1) -conf.define('HAVE_KRB5_KRB5_PRINCIPAL_GET_NUM_COMP', 1) +conf.define('HAVE_KRB5_PRINCIPAL_GET_NUM_COMP', 1) conf.define('HAVE_GSSAPI_GSSAPI_SPNEGO_H', 1) heimdal_includedirs = [] |