s4:heimdal: import lorikeet-heimdal-201107150856 (commit 48936803fae4a2fb362c79365d31...

[amitay/samba.git] / source4 / heimdal / lib / gssapi / krb5 / external.c

diff --git a/source4/heimdal/lib/gssapi/krb5/external.c b/source4/heimdal/lib/gssapi/krb5/external.c
index d6f14a48f7c7f01a3c1e2d7dcdfc13349aa80160..26ede2487d30309cb37c80c2ca4be0c8c46f45cc 100644 (file)
--- a/source4/heimdal/lib/gssapi/krb5/external.c
+++ b/source4/heimdal/lib/gssapi/krb5/external.c
@@ -180,7 +180,7 @@ static gss_mo_desc krb5_mo[] = {
        GSS_C_MA_SASL_MECH_NAME,
        GSS_MO_MA,
        "SASL mech name",
-       "GS2-KRB5",
+       rk_UNCONST("GS2-KRB5"),
        _gss_mo_get_ctx_as_string,
        NULL
     },
@@ -188,7 +188,7 @@ static gss_mo_desc krb5_mo[] = {
        GSS_C_MA_MECH_NAME,
        GSS_MO_MA,
        "Mechanism name",
-       "KRB5",
+       rk_UNCONST("KRB5"),
        _gss_mo_get_ctx_as_string,
        NULL
     },
@@ -196,7 +196,7 @@ static gss_mo_desc krb5_mo[] = {
        GSS_C_MA_MECH_DESCRIPTION,
        GSS_MO_MA,
        "Mechanism description",
-       "Heimdal Kerberos 5 mech",
+       rk_UNCONST("Heimdal Kerberos 5 mech"),
        _gss_mo_get_ctx_as_string,
        NULL
     },
@@ -273,7 +273,7 @@ static gss_mo_desc krb5_mo[] = {
 static gssapi_mech_interface_desc krb5_mech = {
     GMI_VERSION,
     "kerberos 5",
-    {9, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02" },
+    {9, rk_UNCONST("\x2a\x86\x48\x86\xf7\x12\x01\x02\x02") },
     0,
     _gsskrb5_acquire_cred,
     _gsskrb5_release_cred,
@@ -315,7 +315,7 @@ static gssapi_mech_interface_desc krb5_mech = {
     _gsskrb5_store_cred,
     _gsskrb5_export_cred,
     _gsskrb5_import_cred,
-    NULL,
+    _gsskrb5_acquire_cred_ext,
     NULL,
     NULL,
     NULL,
@@ -323,7 +323,16 @@ static gssapi_mech_interface_desc krb5_mech = {
     NULL,
     NULL,
     krb5_mo,
-    sizeof(krb5_mo) / sizeof(krb5_mo[0])
+    sizeof(krb5_mo) / sizeof(krb5_mo[0]),
+    _gsskrb5_pname_to_uid,
+    _gsskrb5_authorize_localname,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL
 };
 
 gssapi_mech_interface