r23456: Update Samba4 to current lorikeet-heimdal.

[jelmer/samba4-debian.git] / source / heimdal / lib / gssapi / mech / gss_wrap.c

diff --git a/source/heimdal/lib/gssapi/mech/gss_wrap.c b/source/heimdal/lib/gssapi/mech/gss_wrap.c
index a97ec1308f07e57a33306a3ae78f8018090b3168..0eb9dfbc6db689b0ac3e14fc52cc0658d932655b 100644 (file)
--- a/source/heimdal/lib/gssapi/mech/gss_wrap.c
+++ b/source/heimdal/lib/gssapi/mech/gss_wrap.c
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_wrap.c,v 1.2 2006/06/28 09:00:26 lha Exp $");
+RCSID("$Id: gss_wrap.c 19965 2007-01-17 16:23:47Z lha $");
 
 OM_uint32
 gss_wrap(OM_uint32 *minor_status,
@@ -41,6 +41,14 @@ gss_wrap(OM_uint32 *minor_status,
        struct _gss_context *ctx = (struct _gss_context *) context_handle;
        gssapi_mech_interface m = ctx->gc_mech;
 
+       if (conf_state)
+           *conf_state = 0;
+       _mg_buffer_zero(output_message_buffer);
+       if (ctx == NULL) {
+           *minor_status = 0;
+           return GSS_S_NO_CONTEXT;
+       }
+
        return (m->gm_wrap(minor_status, ctx->gc_ctx,
                    conf_req_flag, qop_req, input_message_buffer,
                    conf_state, output_message_buffer));