krb5: Add compatability for krb5_const_pac type

This allows this type to be used in Samba in the future for
both Kerberos implementations

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index 2bb04ba5a464480648a7d03bfd29ee8e1b3c298f..d082ed43f03ad987b03b0afe8b399cb9b164d624 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -134,6 +134,10 @@ typedef struct {
 #define KRB5_ERROR_CODE(k)     ((k)->error)
 #endif /* HAVE_E_DATA_POINTER_IN_KRB5_ERROR */
 
+#ifndef HAVE_KRB5_CONST_PAC
+typedef krb5_pac krb5_const_pac;
+#endif
+
 krb5_error_code smb_krb5_parse_name(krb5_context context,
                                const char *name, /* in unix charset */
                                 krb5_principal *principal);

diff --git a/third_party/heimdal_build/wscript_configure b/third_party/heimdal_build/wscript_configure
index 0021cd328ecf7ac112605b29462f557e4ef7f639..a7000d7e77454cec44cf5e2b14c54560846bfa4f 100644 (file)
--- a/third_party/heimdal_build/wscript_configure
+++ b/third_party/heimdal_build/wscript_configure
@@ -130,6 +130,7 @@ conf.define('HAVE_CHECKSUM_IN_KRB5_CHECKSUM', 1)
 conf.define('HAVE_DECL_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE', 0)
 conf.define('HAVE_DECL_KRB5_GET_CREDENTIALS_FOR_USER', 0)
 conf.define('HAVE_E_DATA_POINTER_IN_KRB5_ERROR', 1)
+conf.define('HAVE_KRB5_CONST_PAC', 1)
 conf.define('HAVE_INITIALIZE_KRB5_ERROR_TABLE', 1)
 conf.define('HAVE_KRB5_ADDRESSES', 1)
 conf.define('HAVE_KRB5_AUTH_CON_SETKEY', 1)