Sophie

Sophie

distrib > Mandriva > cs4.0 > i586 > by-pkgid > fd0ee44755e1308ed0742a5b7f369754 > files > 3

ipsec-tools-0.6.5-2mlcs4.src.rpm

--- ipsec-tools-0.6.2b2/src/racoon/gssapi.c.x86_64	2005-10-05 19:28:23.000000000 +0200
+++ ipsec-tools-0.6.2b2/src/racoon/gssapi.c	2005-10-05 19:40:52.000000000 +0200
@@ -288,7 +288,7 @@
 	if (iph1->approval != NULL && iph1->approval->gssid != NULL) {
 		plog(LLV_DEBUG, LOCATION, NULL,
 		    "using provided service '%.*s'\n",
-		    iph1->approval->gssid->l, iph1->approval->gssid->v);
+		    (int)iph1->approval->gssid->l, iph1->approval->gssid->v);
 		name_token.length = iph1->approval->gssid->l;
 		name_token.value = iph1->approval->gssid->v;
 		maj_stat = gss_import_name(&min_stat, &name_token,
@@ -466,7 +466,7 @@
 	*tokens = toks;
 
 	plog(LLV_DEBUG, LOCATION, NULL,
-		"%d itokens of length %d\n", gps->gsscnt, (*tokens)->l);
+		"%d itokens of length %d\n", gps->gsscnt, (int)(*tokens)->l);
 
 	return 0;
 }
@@ -548,7 +548,7 @@
 	}
 
 	plog(LLV_DEBUG, LOCATION, NULL, "wrapped HASH, ilen %d olen %d\n",
-	    hash_in->length, hash_out->length);
+	    (int) hash_in->length, (int) hash_out->length);
 
 	maj_stat = gss_release_buffer(&min_stat, hash_in);
 	if (GSS_ERROR(maj_stat))
@@ -590,7 +590,7 @@
 	hashbuf.value = (char *)(iph1->pl_hash + 1);
 
 	plog(LLV_DEBUG, LOCATION, NULL, "unwrapping HASH of len %d\n",
-	    hashbuf.length);
+	    (int) hashbuf.length);
 
 	maj_stat = gss_unwrap(&min_stat, gps->gss_context, hash_in, hash_out,
 	    NULL, NULL);
--- ipsec-tools-0.6.2b2/src/racoon/ipsec_doi.c.x86_64	2005-10-05 19:41:49.000000000 +0200
+++ ipsec-tools-0.6.2b2/src/racoon/ipsec_doi.c	2005-10-05 19:45:10.000000000 +0200
@@ -285,7 +285,7 @@
 #ifdef HAVE_GSSAPI
 	if (sa->gssid != NULL)
 		plog(LLV_DEBUG, LOCATION, NULL, "gss id in new sa '%.*s'\n",
-		    sa->gssid->l, sa->gssid->v);
+		    (int) sa->gssid->l, sa->gssid->v);
 	if (iph1-> side == INITIATOR) {
 		if (iph1->rmconf->proposal->gssid != NULL)
 			iph1->gi_i = vdup(iph1->rmconf->proposal->gssid);
@@ -303,10 +303,10 @@
 	}
 	if (iph1->gi_i != NULL)
 		plog(LLV_DEBUG, LOCATION, NULL, "GIi is %.*s\n",
-		    iph1->gi_i->l, iph1->gi_i->v);
+		    (int) iph1->gi_i->l, iph1->gi_i->v);
 	if (iph1->gi_r != NULL)
 		plog(LLV_DEBUG, LOCATION, NULL, "GIr is %.*s\n",
-		    iph1->gi_r->l, iph1->gi_r->v);
+		    (int) iph1->gi_r->l, iph1->gi_r->v);
 #else
 	iph1->approval = sa;
 #endif
@@ -757,7 +757,7 @@
 				memcpy(sa->gssid->v, d + 1, len);
 				plog(LLV_DEBUG, LOCATION, NULL,
 				  "received old-style gss id '%.*s' (len %d)\n",
-				  sa->gssid->l, sa->gssid->v, sa->gssid->l);
+				  (int) sa->gssid->l, sa->gssid->v, (int) sa->gssid->l);
 				break;
 			}
 
@@ -812,7 +812,7 @@
 
 			plog(LLV_DEBUG, LOCATION, NULL,
 			    "received gss id '%.*s' (len %d)\n",
-			    sa->gssid->l, sa->gssid->v, sa->gssid->l);
+			    (int) sa->gssid->l, sa->gssid->v, (int) sa->gssid->l);
 			break;
 		}
 #endif /* HAVE_GSSAPI */
@@ -2805,7 +2805,7 @@
 			attrlen += sa->gssid->l * 2;
 		if (buf) {
 			plog(LLV_DEBUG, LOCATION, NULL, "gss id attr: len %d, "
-			    "val '%.*s'\n", sa->gssid->l, sa->gssid->l,
+			    "val '%.*s'\n", (int) sa->gssid->l, (int) sa->gssid->l,
 			    sa->gssid->v);
 			if (lcconf->gss_id_enc == LC_GSSENC_LATIN1) {
 				p = isakmp_set_attr_v(p, OAKLEY_ATTR_GSS_ID,