s4: import lorikeet-heimdal-200810271034

[tprouty/samba.git] / source4 / heimdal / lib / gssapi / krb5 / set_sec_context_option.c

diff --git a/source4/heimdal/lib/gssapi/krb5/set_sec_context_option.c b/source4/heimdal/lib/gssapi/krb5/set_sec_context_option.c
index f28d2397be5d27bfcc3a26f9120158ef30f07759..6591ab04dd63027232f0ea6379a91b5d348cb80b 100644 (file)
--- a/source4/heimdal/lib/gssapi/krb5/set_sec_context_option.c
+++ b/source4/heimdal/lib/gssapi/krb5/set_sec_context_option.c
@@ -192,7 +192,7 @@ _gsskrb5_set_sec_context_option
            }
            memcpy(&c, value->value, sizeof(c));
            krb5_set_send_to_kdc_func(context,
-                                     (krb5_send_to_kdc_func)c.func, 
+                                     (krb5_send_to_kdc_func)c.func,
                                      c.ptr);
        }
 
@@ -242,6 +242,18 @@ _gsskrb5_set_sec_context_option
        if (maj_stat != GSS_S_COMPLETE)
            return maj_stat;
 
+       *minor_status = 0;
+       return GSS_S_COMPLETE;
+    } else if (gss_oid_equal(desired_object, GSS_KRB5_PLUGIN_REGISTER_X)) {
+       struct gsskrb5_krb5_plugin c;
+
+       if (value->length != sizeof(c)) {
+           *minor_status = EINVAL;
+           return GSS_S_FAILURE;
+       }
+       memcpy(&c, value->value, sizeof(c));
+       krb5_plugin_register(context, c.type, c.name, c.symbol);
+
        *minor_status = 0;
        return GSS_S_COMPLETE;
     }