diff -up ipsec-tools-0.7.3/src/racoon/isakmp_agg.c.guard ipsec-tools-0.7.3/src/racoon/isakmp_agg.c
--- ipsec-tools-0.7.3/src/racoon/isakmp_agg.c.guard	2006-09-30 23:49:37.000000000 +0200
+++ ipsec-tools-0.7.3/src/racoon/isakmp_agg.c	2009-09-03 14:15:08.000000000 +0200
@@ -246,7 +246,11 @@ agg_i1send(iph1, msg)
 
 #ifdef HAVE_GSSAPI
 	if (RMAUTHMETHOD(iph1) == OAKLEY_ATTR_AUTH_METHOD_GSSAPI_KRB) {
-		gssapi_get_token_to_send(iph1, &gsstoken);
+		if (gssapi_get_token_to_send(iph1, &gsstoken) < 0) {
+			plog(LLV_ERROR, LOCATION, NULL, 
+			     "Failed to get gssapi token.\n");
+			goto end;
+		}
 		plist = isakmp_plist_append(plist, gsstoken, ISAKMP_NPTYPE_GSS);
 	}
 #endif
@@ -1254,7 +1258,11 @@ agg_r1send(iph1, msg)
 			    iph1->id, ISAKMP_NPTYPE_ID);
 
 			/* create GSS payload */
-			gssapi_get_token_to_send(iph1, &gsstoken);
+			if (gssapi_get_token_to_send(iph1, &gsstoken) < 0) {
+				plog(LLV_ERROR, LOCATION, NULL, 
+				    "Failed to get gssapi token.\n");
+				goto end;
+			}
 			plist = isakmp_plist_append(plist, 
 			    gsstoken, ISAKMP_NPTYPE_GSS);
 
diff -up ipsec-tools-0.7.3/src/racoon/isakmp_ident.c.guard ipsec-tools-0.7.3/src/racoon/isakmp_ident.c
--- ipsec-tools-0.7.3/src/racoon/isakmp_ident.c.guard	2006-10-02 23:41:59.000000000 +0200
+++ ipsec-tools-0.7.3/src/racoon/isakmp_ident.c	2009-09-03 14:17:00.000000000 +0200
@@ -1721,7 +1721,11 @@ ident_ir2mx(iph1)
 
 #ifdef HAVE_GSSAPI
 	if (AUTHMETHOD(iph1) == OAKLEY_ATTR_AUTH_METHOD_GSSAPI_KRB)
-		gssapi_get_token_to_send(iph1, &gsstoken);
+		if (gssapi_get_token_to_send(iph1, &gsstoken) < 0) {
+			plog(LLV_ERROR, LOCATION, NULL,
+				"Failed to get gssapi token.\n");
+			goto end;
+		}
 #endif
 
 	/* create isakmp KE payload */
@@ -1891,7 +1895,11 @@ ident_ir3mx(iph1)
 			if (gsshash == NULL)
 				goto end;
 		} else {
-			gssapi_get_token_to_send(iph1, &gsstoken);
+			if (gssapi_get_token_to_send(iph1, &gsstoken) < 0) {
+				plog(LLV_ERROR, LOCATION, NULL,
+					"Failed to get gssapi token.\n");
+				goto end;
+			}
 		}
 
 		if (!gssapi_id_sent(iph1)) {