Imported Upstream version 4.0.0+dfsg1

[abartlet/samba-debian.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 237af1a52c87e48f94f8494dffe4cb16f56f2e42..141ff722fb648ee96982daa7240149b8e0573f8c 100644 (file)
--- a/source4/heimdal/lib/gssapi/krb5/set_sec_context_option.c
+++ b/source4/heimdal/lib/gssapi/krb5/set_sec_context_option.c
@@ -154,11 +154,10 @@ _gsskrb5_set_sec_context_option
        if (maj_stat != GSS_S_COMPLETE)
            return maj_stat;
 
-       _gsskrb5_register_acceptor_identity(str);
+       maj_stat = _gsskrb5_register_acceptor_identity(minor_status, str);
        free(str);
 
-       *minor_status = 0;
-       return GSS_S_COMPLETE;
+       return maj_stat;
 
     } else if (gss_oid_equal(desired_object, GSS_KRB5_SET_DEFAULT_REALM_X)) {
        char *str;
@@ -222,7 +221,7 @@ _gsskrb5_set_sec_context_option
            return maj_stat;
 
        t = time(NULL) + offset;
-       
+
        krb5_set_real_time(context, t, 0);
 
        *minor_status = 0;