send lifetime, also set minor_status

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11770 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/gssapi/export_sec_context.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 - 2002 Kungliga Tekniska H<>gskolan
+ * Copyright (c) 1999 - 2003 Kungliga Tekniska H<>gskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -52,8 +52,10 @@ gss_export_sec_context (
     krb5_error_code kret;
 
     GSSAPI_KRB5_INIT ();
-    if (!((*context_handle)->flags & GSS_C_TRANS_FLAG))
+    if (!((*context_handle)->flags & GSS_C_TRANS_FLAG)) {
+	*minor_status = 0;
 	return GSS_S_UNAVAILABLE;
+    }
 
     sp = krb5_storage_emem ();
     if (sp == NULL) {
@@ -145,27 +147,6 @@ gss_export_sec_context (
 	    goto failure;
 	}
 
-#if 0
-    {
-	size_t sz;
-	unsigned char auth_buf[1024];
-
-	ret = encode_Authenticator (auth_buf, sizeof(auth_buf),
-				    ac->authenticator, &sz);
-	if (ret) {
-	    krb5_storage_free (sp);
-	    *minor_status = ret;
-	    return GSS_S_FAILURE;
-	}
-	data.data   = auth_buf;
-	data.length = sz;
-	kret = krb5_store_data (sp, data);
-	if (kret) {
-	    *minor_status = kret;
-	    goto failure;
-	}
-    }
-#endif
     kret = krb5_store_int32 (sp, ac->keytype);
     if (kret) {
 	*minor_status = kret;
@@ -196,6 +177,9 @@ gss_export_sec_context (
 	goto failure;
     data.data   = buffer.value;
     data.length = buffer.length;
+
+    ret = GSS_S_FAILURE;
+
     kret = krb5_store_data (sp, data);
     gss_release_buffer (&minor, &buffer);
     if (kret) {
@@ -213,6 +197,11 @@ gss_export_sec_context (
 	*minor_status = kret;
 	goto failure;
     }
+    kret = krb5_store_int32 (sp, (*context_handle)->lifetime);
+    if (kret) {
+	*minor_status = kret;
+	goto failure;
+    }
 
     kret = krb5_storage_to_data (sp, &data);
     krb5_storage_free (sp);
@@ -226,6 +215,7 @@ gss_export_sec_context (
 				  GSS_C_NO_BUFFER);
     if (ret != GSS_S_COMPLETE)
 	gss_release_buffer (NULL, interprocess_token);
+    *minor_status = 0;
     return ret;
  failure:
     krb5_storage_free (sp);

lib/gssapi/krb5/export_sec_context.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 - 2002 Kungliga Tekniska H<>gskolan
+ * Copyright (c) 1999 - 2003 Kungliga Tekniska H<>gskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -52,8 +52,10 @@ gss_export_sec_context (
     krb5_error_code kret;
 
     GSSAPI_KRB5_INIT ();
-    if (!((*context_handle)->flags & GSS_C_TRANS_FLAG))
+    if (!((*context_handle)->flags & GSS_C_TRANS_FLAG)) {
+	*minor_status = 0;
 	return GSS_S_UNAVAILABLE;
+    }
 
     sp = krb5_storage_emem ();
     if (sp == NULL) {
@@ -145,27 +147,6 @@ gss_export_sec_context (
 	    goto failure;
 	}
 
-#if 0
-    {
-	size_t sz;
-	unsigned char auth_buf[1024];
-
-	ret = encode_Authenticator (auth_buf, sizeof(auth_buf),
-				    ac->authenticator, &sz);
-	if (ret) {
-	    krb5_storage_free (sp);
-	    *minor_status = ret;
-	    return GSS_S_FAILURE;
-	}
-	data.data   = auth_buf;
-	data.length = sz;
-	kret = krb5_store_data (sp, data);
-	if (kret) {
-	    *minor_status = kret;
-	    goto failure;
-	}
-    }
-#endif
     kret = krb5_store_int32 (sp, ac->keytype);
     if (kret) {
 	*minor_status = kret;
@@ -196,6 +177,9 @@ gss_export_sec_context (
 	goto failure;
     data.data   = buffer.value;
     data.length = buffer.length;
+
+    ret = GSS_S_FAILURE;
+
     kret = krb5_store_data (sp, data);
     gss_release_buffer (&minor, &buffer);
     if (kret) {
@@ -213,6 +197,11 @@ gss_export_sec_context (
 	*minor_status = kret;
 	goto failure;
     }
+    kret = krb5_store_int32 (sp, (*context_handle)->lifetime);
+    if (kret) {
+	*minor_status = kret;
+	goto failure;
+    }
 
     kret = krb5_storage_to_data (sp, &data);
     krb5_storage_free (sp);
@@ -226,6 +215,7 @@ gss_export_sec_context (
 				  GSS_C_NO_BUFFER);
     if (ret != GSS_S_COMPLETE)
 	gss_release_buffer (NULL, interprocess_token);
+    *minor_status = 0;
     return ret;
  failure:
     krb5_storage_free (sp);